Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Sun, 8 Jan 2017 21:03:47 +0000 (17:03 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sun, 8 Jan 2017 21:03:47 +0000 (17:03 -0400)
commit1f12a20db6b425aa793cca17892bf4b9b7a201d7
treeb89073ea2cc01d6db62897d2f313d8f3a4a2a723
parentba1213c49e0e052fa1e9cab54ce37d5de3046c96
parent4b329c947426ae7ec34c7e42106d564ff76b3d24
Merge branch 'master' of ssh://git-annex.branchable.com