Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Sat, 31 Dec 2016 19:11:18 +0000 (15:11 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sat, 31 Dec 2016 19:11:18 +0000 (15:11 -0400)
commitd4f9b46ab361085cf32a4938a4fc15ef2ffbf72a
tree4790f161584a290bf962e1524bc300e1437c3503
parent0bbef835705311b2c43b32ddee0009ce7cccaa01
parentc8eeb17dad0cfa98e9e3664fd795078fb9cd4c58
Merge branch 'master' of ssh://git-annex.branchable.com