Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 28 Jan 2009 21:52:26 +0000 (16:52 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 28 Jan 2009 21:52:26 +0000 (16:52 -0500)
commit1194584dad1a8326161658e5a5b1c7980d75023f
treeb7856cbbc2b5febc4bc0d2e4fce2cb232d2fd448
parentdeea2f42aabf7e2e2bf8f2c9ec552caebd52f03d
parent4db549721da28fb7aca3863af72675324fb5fb43
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info