Merge "User and installation guide"
authorMorgan Richomme <morgan.richomme@orange.com>
Fri, 8 Jan 2016 13:37:45 +0000 (13:37 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 8 Jan 2016 13:37:45 +0000 (13:37 +0000)

Trivial merge