Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 15 Mar 2008 16:36:13 +0000 (12:36 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 15 Mar 2008 16:36:13 +0000 (12:36 -0400)
commit91142c86adcbb2cddd0e3dc7a38afa8522624ad8
tree7e7324a5f4d2b337610b18c5116b80976705e596
parent8484b3d5e6126e469f312f48787cd047aa4c97a7
parent245126ea49a72c5b021794757f7c172cce4e54f5
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info