Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Sat, 19 Dec 2015 17:47:01 +0000 (13:47 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sat, 19 Dec 2015 17:47:01 +0000 (13:47 -0400)
commitfa1e9a9ee9c4afbcc19bb862083cd3147d028dcb
tree2cec018ad048499225a72f7827a1d607ef760e57
parent35827e2705eb7bfff71bab0e595ebe34587f9cf7
parentdf181d5a382562db1bdc6719ecf6dff3176125ec
Merge branch 'master' of ssh://git-annex.branchable.com