Merge branch '637_friendlier_hooks'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 10 Apr 2013 22:53:05 +0000 (17:53 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 10 Apr 2013 22:53:05 +0000 (17:53 -0500)

Trivial merge