Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 25 Jan 2009 19:40:32 +0000 (14:40 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 25 Jan 2009 19:40:32 +0000 (14:40 -0500)
commit0cfb159bb0f14b769f7182b0ca13e019c5df6d04
tree0ff572913a3788158628bfb3cb47870b99a9f58b
parentee74e61ffc6fa589361a080a2c1476b0fe5afaa3
parent31a6f1735cf98a565a82b7cc720d6b2e8e49ad13
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info