Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Mon, 12 Dec 2016 17:28:50 +0000 (13:28 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 12 Dec 2016 17:28:50 +0000 (13:28 -0400)
commit63da8d88bb3901591f9956dfc9710d8abd3ccadf
tree8a766a36c4150301b4a2efc8e2b7302adda11abf
parentce2828a12f289a97ce3b6b99adaa2d44ecaea984
parentc3ab3c6682d2df96fad8ff476fa89b3b5777c626
Merge branch 'master' of ssh://git-annex.branchable.com