Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 8 Apr 2008 16:52:48 +0000 (12:52 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 8 Apr 2008 16:52:48 +0000 (12:52 -0400)
commit7c7dba8a71dd835fb53e7f24dc2dc6a2a3d8dfe1
tree2b025ec4239bf1c8a6cfb679b1e878d596b2c95a
parent3d8e767c365acf15eb419ef7536ed08a95a21810
parentaf3367eb4e3cc1d939d29eb6568758d56037e0e7
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info