Merge remote-tracking branch 'new-upstream/master' into common-cvs-git-upstream
authorBenjamin Cama <benoar@dolka.fr>
Wed, 1 Feb 2012 23:34:35 +0000 (00:34 +0100)
committerBenjamin Cama <benoar@dolka.fr>
Wed, 1 Feb 2012 23:34:35 +0000 (00:34 +0100)
commit6b36bc85b235d93d46058c8d7015f61f6bcbc45a
tree198358b99977d3d4b7f4308a744b3dba37ce083e
parente57e8c3825df6800ace741a7798ca96c6e9a577e
parentb939b00afdd2a5bbef84a415243c5b0fc7d50702
Merge remote-tracking branch 'new-upstream/master' into common-cvs-git-upstream

Choose the git version when conflicts happen.