Merge branch 'master' of git://git.ikiwiki.info into bugs
authorSimon McVittie <http://smcv.pseudorandom.co.uk/>
Sat, 12 Jul 2008 21:56:55 +0000 (22:56 +0100)
committerSimon McVittie <http://smcv.pseudorandom.co.uk/>
Sat, 12 Jul 2008 21:56:55 +0000 (22:56 +0100)
commitac8a862a06d295ea34b392f56682bc18a85d8495
tree6239e071a4359ba922ef653924fbc53ff44b40e9
parentbed1f1037a4dfe6368c81ea2e2a0ac32f56126ce
parent44e42209a83f92c3a75c5524e38b36342309b7c1
Merge branch 'master' of git://git.ikiwiki.info into bugs