Merge branch 'master' into stable
commitf256c70f224e3618a4a1af131d0fcba079534d40
authorGuy Brand <gb@unistra.fr>
Wed, 8 Oct 2014 07:56:58 +0000 (8 09:56 +0200)
committerGuy Brand <gb@unistra.fr>
Wed, 8 Oct 2014 07:56:58 +0000 (8 09:56 +0200)
treefcbb54cb26138a28e00f21e95b0563d9496ecbae
parentfe2e5166213d288a2d135b2f440ed3adb0163aa9
parent7172294d0cc39ec10ad431dfdd0dd20e15a4ba35
Merge branch 'master' into stable