tree 3644f2e5d6539df4462f4841adfc582f46959c3e
parent 6acd4dc92567bc7b4fab71399cb800afd10c6dea
parent b1b1b72de66f31562f6bd42f0ae26f6a5d439398
author garciadeblas <gerardo.garciadeblas@telefonica.com> 1496846242 +0200
committer Gerrit Code Review <root@osm.etsi.org> 1496846242 +0200

Merge "Work around version conflicts between Rift and Ubuntu archives"