Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 27 Sep 2009 22:34:50 +0000 (18:34 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 27 Sep 2009 22:34:50 +0000 (18:34 -0400)
commit1a366910d30a0ff07a16f3d0505e0584a63a465a
tree49158d6fd910f30cca4c4cbbbac313cf0e5ced33
parent2acaa15830760695eb673ddb0b17aed715e97f3c
parentba4071bde21a199e77f15b54d8785debc69613e6
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info