Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Wed, 16 Dec 2015 21:05:12 +0000 (17:05 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 16 Dec 2015 21:05:12 +0000 (17:05 -0400)
commit0914d33b215ff9ddc837951e051084ef31622f4c
treefad9a0ace1571d7970b6680cf96fb8da685c3790
parentca9b84754dd00261dd3cc254338ddbb15fe93e74
parent4a02a243f304182a98622f35826ced7aee847c97
Merge branch 'master' of ssh://git-annex.branchable.com