Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 7 Apr 2010 02:59:57 +0000 (22:59 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 7 Apr 2010 02:59:57 +0000 (22:59 -0400)
commitf2a87addc63114edd3e096cff286bc3b19989df3
tree59309b8d582403d4f64303ada3565d2cb99f8d92
parentc0ca1967586234ae4e84e485af53804df2198bcd
parent1158fe8f4400943d7a24350c6ac8fee6a95c2bed
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info