Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joey@kitenet.net>
Sun, 31 Mar 2013 23:15:14 +0000 (19:15 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 31 Mar 2013 23:15:14 +0000 (19:15 -0400)

Trivial merge