Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 31 Dec 2008 19:08:15 +0000 (14:08 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 31 Dec 2008 19:08:15 +0000 (14:08 -0500)
commit523650d9c2b876152aaa9bc6c5d6363377ea7008
tree7fe9b05c4a173149e1e792664e19920599889c2b
parentffec6806087981420eaf83c8d83cc4523a46d0de
parentdc7c11261dc1f2141fbd8786c2cd55224b769fc2
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info