Merge branch 'master' into stable/arno 79/2179/1 arno.2015.2.0
authorMorgan Richomme <morgan.richomme@orange.com>
Thu, 1 Oct 2015 09:03:09 +0000 (11:03 +0200)
committerMorgan Richomme <morgan.richomme@orange.com>
Thu, 1 Oct 2015 09:03:09 +0000 (11:03 +0200)
commit19c7d0ecfd453d5e631466401e454d4da3314f9b
treec1dac5451af1760f963d709772b5062ba2741983
parent5901dd9a47b08c162acb631bf5acaeeb1b7ce745
parent96bf9abe9b1b26a79dcc86900e8eb33d8544e773
Merge branch 'master' into stable/arno