Merge branch 'master' of git://github.com/joeyh/ikiwiki
authorAmitai Schlair <schmonz@magnetic-babysitter.(none)>
Fri, 4 Sep 2009 20:02:58 +0000 (15:02 -0500)
committerAmitai Schlair <schmonz@magnetic-babysitter.(none)>
Fri, 4 Sep 2009 20:02:58 +0000 (15:02 -0500)
commitab88adc5e401f3dad8bc812965b78b45fd08fa26
tree36d656e0b3f6b3dae3d99b91945b608b8b915948
parentd79cf3728d9984e92e2bffd147d280a697b46fe6
parent21239db15685112254875f546e1a74e86051a933
Merge branch 'master' of git://github.com/joeyh/ikiwiki