Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 22 Mar 2008 17:57:01 +0000 (13:57 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 22 Mar 2008 17:57:01 +0000 (13:57 -0400)
commit3b49868eb98e33204ca52ba944be4023f9f3f821
treeb38fdce23e72a92ba3f43cc48845f3c025072550
parent20271cf172ee0c231d94683db70c42acfc9f6b2a
parent5ed5babef424d12721bbb5252712de8be9d61035
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info