Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joey@kitenet.net>
Fri, 29 Mar 2013 20:56:14 +0000 (16:56 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 29 Mar 2013 20:56:14 +0000 (16:56 -0400)

Trivial merge