Merge remote-tracking branch 'remotes/dgit/dgit/sid'
authorJoey Hess <joey@kitenet.net>
Mon, 26 Aug 2013 15:50:26 +0000 (11:50 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 26 Aug 2013 15:50:26 +0000 (11:50 -0400)

Trivial merge