Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 16 May 2010 01:10:02 +0000 (21:10 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 16 May 2010 01:10:02 +0000 (21:10 -0400)
commitcae6e7fa9666c59b60887bd2c377bd6a7d2cd4bb
tree93c59e88e31298079ba1981df126dafa82f5345f
parent8c05fcde9ee5ae9da5de71e0c27d59aca106c877
parente650b084a3651b4f49b60c6397501dea01723a51
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info