Merge branch 'master' of git://github.com/joeyh/ikiwiki
authorAmitai Schlair <schmonz@magnetic-babysitter.(none)>
Sun, 30 Aug 2009 20:34:32 +0000 (16:34 -0400)
committerAmitai Schlair <schmonz@magnetic-babysitter.(none)>
Sun, 30 Aug 2009 20:34:32 +0000 (16:34 -0400)
commitfe350e8b895be69471fad094fcdcf0b4c7d3beb3
tree5d48b57f583fedc2a9b765d3a9ea7b0c6c1d5891
parent1af7d7d8429b6e73493a5f8ba877c6cfb888cfe1
parent7021fc36466d80ca0c4105b82239d3ba008ade80
Merge branch 'master' of git://github.com/joeyh/ikiwiki