Merge remote-tracking branch 'upstream-repo/master' into upstream upstream/2.2.1
authorBenjamin Cama <benoar@dolka.fr>
Thu, 7 Jul 2011 10:47:12 +0000 (12:47 +0200)
committerBenjamin Cama <benoar@dolka.fr>
Thu, 7 Jul 2011 10:47:12 +0000 (12:47 +0200)
commite57e8c3825df6800ace741a7798ca96c6e9a577e
treee1a73293c10ce27c000372272b4da139e8369f4d
parentf2a3180cc0123acabfed9e48200be0a063f695c0
parent46d1fa17df93a23dd0021119bebe0d1ef9546348
Merge remote-tracking branch 'upstream-repo/master' into upstream