Merge branch '4038-commit-hooks-accept-fixes'
authorTim Pierce <twp@unchi.org>
Tue, 30 Sep 2014 17:27:41 +0000 (13:27 -0400)
committerTim Pierce <twp@unchi.org>
Tue, 30 Sep 2014 17:27:41 +0000 (13:27 -0400)
Closes #4038.


Trivial merge