Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 10 Feb 2008 17:21:49 +0000 (12:21 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 10 Feb 2008 17:21:49 +0000 (12:21 -0500)
commit196d27cbbc868f82ce9e598b0d7d1a8c460a52c6
treed4875c79ca6a2974d497423b7347932c81a09439
parent5e47db9356e0881d0b0cf5135d6e63a64bcde545
parentf185ab4afce0d75ddffb2b886f1abf1645223ffb
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info