Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 4 Sep 2008 18:13:26 +0000 (14:13 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 4 Sep 2008 18:13:26 +0000 (14:13 -0400)
commitc427ab7ccbe6c5fe43602a724bbeab454d50195c
treeb69b11b3f86e89ccc86e3ecaee0e62e4e438c3af
parentd2679de965a0300474341139871855bbccc61612
parentcf125ba1b290eb61eccb12260c9b6cb216866804
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info