Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 9 Jan 2008 19:35:11 +0000 (14:35 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 9 Jan 2008 19:35:11 +0000 (14:35 -0500)
commited30330ac23ca84235e09cfc2f0acd55d62e4a09
treed1b05f9b7b0ee0384dcbfda321e8b5331759b86d
parent57ff2ecaeddb3e802fbec50acd7bf286941ec000
parent9f34404bb38b69ea7e438581d0c3348e0d99b5fc
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info