Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Mon, 9 Nov 2015 15:34:30 +0000 (11:34 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 9 Nov 2015 15:34:30 +0000 (11:34 -0400)
commit140d74196c519b9f40fc88940982a728df3dd198
tree51b57200e4ee7cfea81a5dbd81dfe458758a70bb
parent6cfcdc99f113e0c8b8dff67d2993a6cc195f8190
parenteb0b79c9913ebfbb11533cb2f56b205e6929fe61
Merge branch 'master' of ssh://git-annex.branchable.com