Merge branch 'master' into develop
commit06a2375915351664f9704b4f564d233f408b7c2e
authorVincent Ollivier <contact@vincentollivier.com>
Thu, 10 May 2012 17:56:29 +0000 (10 19:56 +0200)
committerVincent Ollivier <contact@vincentollivier.com>
Thu, 10 May 2012 17:56:29 +0000 (10 19:56 +0200)
treee117a91ed2905627e3afff6b4d57c6cc46ae4e76
parent163ecbd8d02e3484d78d1be1e62f3ec54489f79b
parent930b99cde0871f6a2a811e9d66562b9a11194653
Merge branch 'master' into develop