Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joey@kitenet.net>
Wed, 3 Apr 2013 03:40:04 +0000 (23:40 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 3 Apr 2013 03:40:04 +0000 (23:40 -0400)

Trivial merge