Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joey@kitenet.net>
Tue, 2 Apr 2013 20:55:21 +0000 (16:55 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 2 Apr 2013 20:55:21 +0000 (16:55 -0400)

Trivial merge