Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 10 Apr 2009 21:48:28 +0000 (17:48 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 10 Apr 2009 21:48:28 +0000 (17:48 -0400)
commit6887d1af2af9926231d01a3b95b46a69241d1836
treea3419bd683a8a33443640ede5bb45a3ecd210a63
parent2eb990b3f5496d271adb5b42ad393dc810700ba5
parent26189b6dffa05c6a674f5da9cc5bb1d9f4565ae7
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info