]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' into next
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 23 Dec 2008 21:27:02 +0000 (16:27 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 23 Dec 2008 21:27:02 +0000 (16:27 -0500)
commit6e4f34b0b847ed898cbe3078280d7b5bf4398790
treeeba3c5bf1e5ee14324542f0facf80ba86ef56cd9
parent70fa222d06a0f1d97ae135deaf0ea2f81ba60c6e
parentecf2408bf64de1aee3bb8b79f6e28c14b52cf1c4
Merge branch 'master' into next