Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 9 Sep 2010 22:23:40 +0000 (18:23 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 9 Sep 2010 22:23:40 +0000 (18:23 -0400)
commit57f9dd2e1aecfa718899f0626d1da1fef9eead49
tree506c68343dd224a1655fd5d47a2b5dc0332f4fe3
parent074c9869f3223387e636d1bcea8276c49ef12fda
parent62672f88cdae1fcc811d7fe99fbafc678d2a857a
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info