Merge "Prepare Brahmaputra 3.0 release"
authorMorgan Richomme <morgan.richomme@orange.com>
Wed, 27 Apr 2016 15:59:03 +0000 (15:59 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 27 Apr 2016 15:59:03 +0000 (15:59 +0000)

Trivial merge