Merge branch 'master' into stable
commit8fe0323d4795102e571412d8c53c714c34c8a854
authorGuy Brand <gb@unistra.fr>
Tue, 7 Mar 2017 20:00:55 +0000 (7 21:00 +0100)
committerGuy Brand <gb@unistra.fr>
Tue, 7 Mar 2017 20:00:55 +0000 (7 21:00 +0100)
treeeba29750116979ffb84a003c0ef60601c4e7bd5d
parente349ed8aad695b254ffa049dd715a65445f5eed6
parentbcbb31f43501c3f10560db71ab9bf34e0780e4a6
Merge branch 'master' into stable