Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 24 Jan 2008 22:25:07 +0000 (17:25 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 24 Jan 2008 22:25:07 +0000 (17:25 -0500)
commit285be77f17a6efb7633242a0febcadf511f61c10
tree4e0f81a536ede60b4049c6661aacbb958beb698d
parent4f872b563300e4a277cac3d7ea2a999bcf75d1ff
parent035d5bca488fa7a98b93b11929bf51816753bcdf
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info