Merge branch 'master' into stable
commit43a2e077a27740ebb0f0bc49e4a3d288c8811d78
authorGuy Brand <gb@unistra.fr>
Mon, 5 May 2014 20:51:26 +0000 (5 22:51 +0200)
committerGuy Brand <gb@unistra.fr>
Mon, 5 May 2014 20:51:26 +0000 (5 22:51 +0200)
treee22f94855951702e622d4c40ac44f3031b3d5819
parentc6af9e94ed5d7f7713359faac18543db9a9aee48
parent75930869ddcb31470ea7617eddfb882de02645df
Merge branch 'master' into stable