Merge branch 'master' of git://github.com/joeyh/ikiwiki
authorAmitai Schlair <schmonz@magnetic-babysitter.Ativa>
Tue, 8 Sep 2009 17:08:49 +0000 (13:08 -0400)
committerAmitai Schlair <schmonz@magnetic-babysitter.Ativa>
Tue, 8 Sep 2009 17:08:49 +0000 (13:08 -0400)
commit1332327f5e9fa394076b5a80b2678e9c2fa0bb48
treefbdd535fbdab15b1cb53b4874281804bd5d66888
parentab88adc5e401f3dad8bc812965b78b45fd08fa26
parent3813632a8fe8940622f9cb40d94dbbab7e3f4194
Merge branch 'master' of git://github.com/joeyh/ikiwiki