Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 19 Mar 2008 19:15:30 +0000 (15:15 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 19 Mar 2008 19:15:30 +0000 (15:15 -0400)
commitd8c4ea783be95b0ec0f4c69a4a1f230ac0e43601
tree738c81383a22090d72a074ec5511761f9ef83926
parentf003e97d10e42ea97b4a03fd62a296fe993a9677
parent4f6728a68536f5ea70d3e7b45e56bac099f7ed4f
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info