Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Wed, 2 Dec 2015 16:33:08 +0000 (12:33 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 2 Dec 2015 16:33:08 +0000 (12:33 -0400)
commit755fbbef08c50e3adc16d45121d8921784f7aa19
tree2d7b6420070eaae1f5e0a4a7d64ae3a08a993f2f
parent382f8a790afcc97e370960d02f4d4d9e2b1577ad
parent4cd2c24dacfa911317623e490bbce6b722f1f37d
Merge branch 'master' of ssh://git-annex.branchable.com