Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 5 Jan 2009 23:52:58 +0000 (18:52 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 5 Jan 2009 23:52:58 +0000 (18:52 -0500)
commit82182bb16eb28561a6c4ef22c9ad1e2f40b0ac3a
treec28b30577707f93bc2268a045c1a1726a87598b0
parentbc0de40c3c71206c927ec08ee78e8a726abc7995
parent865cbaea51c5d64966bcb01c718c737b03cd64d5
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info