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)
commit9829cae3e6c071bde28a69d5411bb895d967f010
tree3644f2e5d6539df4462f4841adfc582f46959c3e
parent6acd4dc92567bc7b4fab71399cb800afd10c6dea
parentb1b1b72de66f31562f6bd42f0ae26f6a5d439398
Merge "Work around version conflicts between Rift and Ubuntu archives"