Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joey@kitenet.net>
Tue, 26 Mar 2013 02:09:31 +0000 (22:09 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 26 Mar 2013 02:09:31 +0000 (22:09 -0400)

Trivial merge