Merge branch 'release-2.1.0'masterv2.1.0
commit768c79e488f04bca6b7e14fe91dbc06d26b333b4
authorVincent Ollivier <contact@vincentollivier.com>
Sat, 10 Nov 2012 10:29:21 +0000 (10 11:29 +0100)
committerVincent Ollivier <contact@vincentollivier.com>
Sat, 10 Nov 2012 10:29:21 +0000 (10 11:29 +0100)
tree97571843f26095170118ca4f39fdb3abe9e7b460
parent930b99cde0871f6a2a811e9d66562b9a11194653
parent6775dc014c419fa108f23a71466383000f5f615b
Merge branch 'release-2.1.0'