Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joey@kitenet.net>
Mon, 1 Apr 2013 19:21:04 +0000 (15:21 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 1 Apr 2013 19:21:04 +0000 (15:21 -0400)

Trivial merge