Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Sat, 19 Dec 2015 17:47:01 +0000 (13:47 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sat, 19 Dec 2015 17:47:01 +0000 (13:47 -0400)

Trivial merge