Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 6 Nov 2008 21:05:23 +0000 (16:05 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 6 Nov 2008 21:05:23 +0000 (16:05 -0500)
commit72c03656f91db1e9eff1f9d8251c8baeffef10f7
treef3b6f3685afe73fc8017cd9ee37c69720d7ea045
parentecf2399f4fd2a515f4f5d6f0040024097a284343
parentdc8929e2f0e53216619340b29bd0d9d6d1f83827
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info