Merge branch 'master' of git://git.ikiwiki.info
authorSimon McVittie <http://smcv.pseudorandom.co.uk/>
Sun, 13 Jul 2008 14:32:40 +0000 (15:32 +0100)
committerSimon McVittie <http://smcv.pseudorandom.co.uk/>
Sun, 13 Jul 2008 14:32:40 +0000 (15:32 +0100)
commit31bc223abbe0ec1990921b4bab85f074431b0c1d
tree85fc835a3194c3824ddaf383ffe07e199615134f
parentc588845a051da89505db9e55158783e1650ff0e2
parent2d6263b9917c1d7e5f3e675aaf7dd04d8f11365f
Merge branch 'master' of git://git.ikiwiki.info