tree d718d19fa8a2884a14b082c6f3a87936dc746916
parent d29ba9bdd31502cbcc7aeaa793230ff17ff1b46e
parent d983e33014bd3d8f8998d6cec8a13c909f6f7668
author David Pursehouse <dpursehouse@collab.net> 1495512742 +0900
committer David Pursehouse <dpursehouse@collab.net> 1495512746 +0900

Merge branch 'stable-2.14'

* stable-2.14:
  Add configuration option to not add weblinks
  GitilesWeblinks: Annotate as @Singleton

Change-Id: I141c740927bd4606c6fe224b36b35d4c5d0420f3