Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Mon, 14 Nov 2016 20:50:14 +0000 (16:50 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 14 Nov 2016 20:50:14 +0000 (16:50 -0400)
commitb9a68957ccd8a45a27b25f96397f712599d78803
treeb0481e8b6aa948c2b6990b2f7800c94df8a7e7d7
parent35116c5d044177f82d4aef1f795a0ef9e78ec707
parentc20505f02a9f0f6aec5e25e7d7a7667a98f510fa
Merge branch 'master' of ssh://git-annex.branchable.com