Merge "Work around version conflicts between Rift and Ubuntu archives"
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Wed, 7 Jun 2017 14:37:22 +0000 (16:37 +0200)
committerGerrit Code Review <root@osm.etsi.org>
Wed, 7 Jun 2017 14:37:22 +0000 (16:37 +0200)

Trivial merge