Merge "Prepare integration of ovno"
authorMorgan Richomme <morgan.richomme@orange.com>
Mon, 18 Jan 2016 16:15:35 +0000 (16:15 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 18 Jan 2016 16:15:35 +0000 (16:15 +0000)

Trivial merge