Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Mon, 21 Dec 2015 16:57:20 +0000 (12:57 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 21 Dec 2015 16:57:20 +0000 (12:57 -0400)
commitd3240f462262af9ef4db989fd9cfef5f773c6320
tree3359dd891ab9cfad40ae15be64cac1f53ba4c93f
parenta8b398c1fa7fb0acfe24d02fa46274794eee2f48
parent7505f0970a6a9026e54a5fcc8b6622bca49b42a3
Merge branch 'master' of ssh://git-annex.branchable.com