]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' into pub/master
authorintrigeri <intrigeri@boum.org>
Mon, 24 Nov 2008 20:54:11 +0000 (21:54 +0100)
committerintrigeri <intrigeri@boum.org>
Mon, 24 Nov 2008 20:54:11 +0000 (21:54 +0100)
commita605ee2c562323dc29852787c48a28bd03706718
treec2830126f4496594c44f77c09a50c494741b1956
parentd47de5a7dfc0cc3e9d8ed2d51fc0e353f3141177
parentde9e7da35a337aa9b0ccca35bd564cf069d0d67d
Merge branch 'master' into pub/master