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

Trivial merge