Merge branch master into stable
commit83f133d10eda8c1c6b6429c08b2d0722ca88ca17
authorGuy Brand <gb@unistra.fr>
Fri, 10 May 2013 12:35:28 +0000 (10 14:35 +0200)
committerGuy Brand <gb@unistra.fr>
Fri, 10 May 2013 12:35:28 +0000 (10 14:35 +0200)
tree0377662d2335a0e2160175d5be3b95a92f6bb332
parentbc250e0ee2ec4fba891b53aa4f1814ce648ac71a
parent2a5a1456564635ddbca06edbc902e7f820d2a97b
Merge branch master into stable