Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 21 Mar 2008 20:34:17 +0000 (16:34 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 21 Mar 2008 20:34:17 +0000 (16:34 -0400)
commit060183df6797c22edad0bef0d75ee9043b211bf8
treed6de1293145d9464c788e1d211366d164882e7d5
parent479f75abf41451a239cb0b9fa945469127e6df2d
parent6d5bce3935e58052bb0bd7227e90c1681b2ac45b
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info