Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Sun, 18 Dec 2016 21:18:05 +0000 (17:18 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sun, 18 Dec 2016 21:18:05 +0000 (17:18 -0400)
commit0b4213d3719193a22c40856593a585553ad421b1
tree3d66da7d3fcdaa21375fb364dce3c3bef76d9641
parent249ddb595398caf675636794674a46bcc279bc51
parent6402318e85a69b39fc0e2735fd23831ffd0ecc06
Merge branch 'master' of ssh://git-annex.branchable.com