Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Wed, 16 Dec 2015 00:50:52 +0000 (20:50 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 16 Dec 2015 00:50:52 +0000 (20:50 -0400)

Trivial merge