Merge branch 'master' of git://github.com/joeyh/ikiwiki
authorAmitai Schlair <schmonz@magnetic-babysitter.(none)>
Fri, 11 Sep 2009 21:03:41 +0000 (17:03 -0400)
committerAmitai Schlair <schmonz@magnetic-babysitter.(none)>
Fri, 11 Sep 2009 21:03:41 +0000 (17:03 -0400)
commit5a627f1853b4edcbe38dabcfca37fde477572ef5
treec33891232176d2321fc3f7f2abfa63888af82f47
parenta69d628b2cc15779a23c3d5ca1b27f2bc2dad619
parent1846bd30611c69e223e1bb8d3ff5d4b9444dd51c
Merge branch 'master' of git://github.com/joeyh/ikiwiki