Merge remote-tracking branch 'anarcat/inline_diffs'
authorJoey Hess <joey@kitenet.net>
Thu, 19 Jul 2012 17:46:45 +0000 (13:46 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 19 Jul 2012 17:46:45 +0000 (13:46 -0400)

Trivial merge