Merge branch 'release-2.0.2' into masterv2.0.2
commite3a80f50616cacc951a863db5b8c2b5531f82426
authorVincent Ollivier <contact@vincentollivier.com>
Mon, 26 Mar 2012 17:53:41 +0000 (26 19:53 +0200)
committerVincent Ollivier <contact@vincentollivier.com>
Mon, 26 Mar 2012 17:53:41 +0000 (26 19:53 +0200)
treea1a76be04f27a5817b569e9cd952cb11b438cd5f
parentb157843cfa7cd8f509a27ed589a2b1c98b4bef19
parent2251a88c69c68fd686c9e4b6428c28f6b7a64673
Merge branch 'release-2.0.2' into master