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

Trivial merge