Merge "Merge branch 'v1.1'"
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 10 Mar 2017 13:22:02 +0000 (14:22 +0100)
committerGerrit Code Review <root@osm.etsi.org>
Fri, 10 Mar 2017 13:22:02 +0000 (14:22 +0100)

Trivial merge