tree 410b0482750ac9b44833883f82d01d81ca26c04f
parent ff123a435444155f89625f8f3279c2912608b2bf
parent 0e4e41a160afb3553ea0a895500770b290ab569b
author David Pursehouse <dpursehouse@collab.net> 1498271094 +0900
committer David Pursehouse <dpursehouse@collab.net> 1498271098 +0900

Merge branch 'stable-2.14'

* stable-2.14:
  Fix hook configuration names to match documentation

Change-Id: I66c9fadef5c2615a39af06f9560bbb9d4d477c17