Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 14 Jul 2008 17:42:57 +0000 (13:42 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 14 Jul 2008 17:42:57 +0000 (13:42 -0400)
commit5acfbb50aab538ac43bccb55ba2427cbffa26f0d
treefd09b8aeeb25c1f6efa375e2f1106d55c00d1710
parent9957c7fd5d17afdc2e7e4248ca8a961731048d51
parentf8de860a44eabe5f954641d48d0bdf2e804519d7
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info