Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 30 Apr 2008 16:58:55 +0000 (12:58 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 30 Apr 2008 16:58:55 +0000 (12:58 -0400)
commit7647109bac71f0930717fe90f8eab4bd24960c6a
treecd7beb4eb474a84191e911592088b0230c95208d
parentbb51e81762587364ae571b1f0a59955637e0e4a5
parent3419cdfcbb6ea3d939c0803e82644b9b36e41c6a
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info