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

Trivial merge