Merge "Editorials"
authorMorgan Richomme <morgan.richomme@orange.com>
Fri, 29 Jan 2016 16:15:38 +0000 (16:15 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 29 Jan 2016 16:15:39 +0000 (16:15 +0000)

Trivial merge