Merge remote-tracking branch 'bremner/master'
authorJoey Hess <joey@kitenet.net>
Fri, 15 Aug 2014 16:54:30 +0000 (12:54 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 15 Aug 2014 16:54:30 +0000 (12:54 -0400)

Trivial merge