Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Fri, 4 Dec 2015 22:05:18 +0000 (18:05 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 4 Dec 2015 22:05:18 +0000 (18:05 -0400)
commit1b597cbee6eb07d761a1dff2baa998b58e7694a6
treef01542ce689252bbd2d3be90dc2839d3e4b864a7
parent7579d5095902e39af2a609f23489a9543647f1fd
parentf966984cd3ff8e899cf9278bb00d42763d28f574
Merge branch 'master' of ssh://git-annex.branchable.com