Merge branch 'master' into stable
commit6122d28a9f43d0aadfc37f11da92a96f262a00a6
authorGuy Brand <gb@unistra.fr>
Sun, 26 Jun 2016 11:20:50 +0000 (26 13:20 +0200)
committerGuy Brand <gb@unistra.fr>
Sun, 26 Jun 2016 11:20:50 +0000 (26 13:20 +0200)
tree4dfe085e5dc0af44fd0fed6cbbce1835a63f3fba
parente92c26f27fe6a45c5c52478af65cc32e32c7d9ec
parentc8574e7db018baeceb087ecb8502df3473c1d68c
Merge branch 'master' into stable