Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 7 May 2008 21:06:12 +0000 (17:06 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 7 May 2008 21:06:12 +0000 (17:06 -0400)
commita7ece50826e68ef6fff2c541f4fa51ed25cba263
treef04dbf239e7de2cc29f8f5d46d8bb3556756b0b8
parentcdf8ced4c298124475336a3ee82d2754bc1b7f95
parent2b5d12f658ef61cfe831c97ee411807b2ab5b611
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info