Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 6 Mar 2008 17:05:36 +0000 (12:05 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 6 Mar 2008 17:05:36 +0000 (12:05 -0500)
commit0e7896690b8dbeb7c74fc0ce1f954159861fc8b3
tree415a5b207c250d4c7905f538bd9982f1bf34fd18
parent4401e5b9edcc99766ec0b0bdfd3125b3ddc94e6a
parent91ea6629433fb4e21db4b64ef47a8990e80a2533
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info