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

Trivial merge