Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 5 Jan 2008 06:29:27 +0000 (01:29 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 5 Jan 2008 06:29:27 +0000 (01:29 -0500)
commitf51e47d7f9b0dbc1fe8c356acadbf5ef2da227af
tree1def260e13c89af24cd6685663cc5c9f58720efe
parent9f2b52cdb0066292b65e226e32fff698393f294a
parentf9fa96ded77418851da8b094f73c25dbde8a9714
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info