Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Mon, 21 Dec 2015 15:34:51 +0000 (11:34 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 21 Dec 2015 15:34:51 +0000 (11:34 -0400)
commita1927c6adbc885c9942d8c058c803b7faeeafc1d
tree6d9055ee488c63cc416b20b130162582e6df4b22
parentb6ac443b60c66cd8cfabb9987f00f161d6f644f5
parentb032015f57b1a7632c846bbdf8e3f48bcec99f2b
Merge branch 'master' of ssh://git-annex.branchable.com