Merge branch 'master' of git://git.ikiwiki.info
authorSimon McVittie <http://smcv.pseudorandom.co.uk/>
Sat, 12 Jul 2008 21:44:36 +0000 (22:44 +0100)
committerSimon McVittie <http://smcv.pseudorandom.co.uk/>
Sat, 12 Jul 2008 21:44:36 +0000 (22:44 +0100)
commitf59d7f1e9b3851dd86acf9d46096ca8de6fad540
treedf8b283421a49fe6f8e6228079fb9ab192a619f6
parent23a3de5e8c4998c41afc99664fd4a7fe25e7bf29
parentce4c5142b05cb31876bf000ea728db9d56fa39ed
Merge branch 'master' of git://git.ikiwiki.info