Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joey@kitenet.net>
Sat, 30 Mar 2013 14:37:07 +0000 (10:37 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 30 Mar 2013 14:37:07 +0000 (10:37 -0400)

Trivial merge