Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 24 Apr 2008 17:49:35 +0000 (13:49 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 24 Apr 2008 17:49:35 +0000 (13:49 -0400)
commit6bb7f948563fd5305aa95fc71bd2cb7f5c85bb25
tree361066b557aca6defd202238cbf6099a47bae218
parent7d7f85bbb5ec48a193973ef2dbe6d78a2f4f8ea8
parent7758dbb27980daceb3e6714b6f3f8c32ee354fc7
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info