Merge branch 'master' into stable
commit23678e344b4ddcad14254c106ecb93af174fdaa0
authorGuy Brand <gb@unistra.fr>
Wed, 6 Mar 2013 13:08:08 +0000 (6 14:08 +0100)
committerGuy Brand <gb@unistra.fr>
Wed, 6 Mar 2013 13:08:08 +0000 (6 14:08 +0100)
treea5c787e4d87313a7fb6f18cb4c78bf210d92d60c
parent847cef0a6bfd2ff9dc54e1fc140f5ba0ece0017a
parent5721a1547938df76003c6d91ea003dc1c70abd94
Merge branch 'master' into stable