]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master'
authorintrigeri <intrigeri@boum.org>
Wed, 12 Nov 2008 11:54:29 +0000 (12:54 +0100)
committerintrigeri <intrigeri@boum.org>
Wed, 12 Nov 2008 11:54:29 +0000 (12:54 +0100)
commit44dad2157916fcd2bb6d0dfd1fec2d912630e0a8
treebf69fb4d0c69d2e219be0fd14dd2cd6913a01470
parentcf7d64a69ed81731d148ed237b800fd4dde98027
parent2c858c9c95e287ebe3740a94f983f6ae9d6fb080
Merge commit 'upstream/master'