Merge branch 'master' into stable
commitd1c5a21205ecdf83c4cbdcd9245556121688e798
authorGuy Brand <gb@unistra.fr>
Sun, 23 Aug 2015 13:54:03 +0000 (23 15:54 +0200)
committerGuy Brand <gb@unistra.fr>
Sun, 23 Aug 2015 13:54:03 +0000 (23 15:54 +0200)
treef99aacf8e4e2aad00b106d9b905a14c3536ba935
parent2beabe635c6b98fcf412ba42d137a5de33543109
parent0f0d29909c63f9897c9c003e6d3e3b8381a6f36d
Merge branch 'master' into stable