Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 3.03
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 29 Jan 2009 19:45:58 +0000 (14:45 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 29 Jan 2009 19:45:58 +0000 (14:45 -0500)
commite37a0812b0dd88ae478fd5c28f4009e93709b31f
tree2568697b16cae962095aae71d8d44452166eaa36
parent78529b335c786a2e988e71a31827929a84da2b6d
parenta46cf100f01b5db96980737b1c2b25deff68e5a0
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info