Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joeyh@joeyh.name>
Fri, 2 Jan 2015 16:45:54 +0000 (12:45 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 2 Jan 2015 16:45:54 +0000 (12:45 -0400)
commitbd8198fb77ed5cf77ddeb860ca1ac983bfaacbbd
tree50d784e48059358a2eaad1ac0241201d94ecab0d
parent2ad84a27d4959a50184c87ee6d285a41690e9e4e
parent4ce18a7f4a85c5ba2cea73dc2dab093bc44ea934
Merge branch 'master' of ssh://git.ikiwiki.info