Merge branch 'master' of git://github.com/joeyh/ikiwiki
authorAmitai Schlair <schmonz@magnetic-babysitter.(none)>
Fri, 4 Sep 2009 00:24:42 +0000 (19:24 -0500)
committerAmitai Schlair <schmonz@magnetic-babysitter.(none)>
Fri, 4 Sep 2009 00:24:42 +0000 (19:24 -0500)
commit1888464a0d9de9cf4ac40c298924018437758aa2
treeb55aedb4983dd142e966ade8e270fd1d33fc2834
parent85844b8494dd5e032d06afd623c25b4bb4a72578
parentf582457ea04a6ce66a2c54ec0731e2569aa30d3f
Merge branch 'master' of git://github.com/joeyh/ikiwiki