Merge "Switching to using local package mirror for installation" into stable/brahmaputra
authorStefan K. Berg <stefan.k.berg@ericsson.com>
Fri, 5 Feb 2016 11:57:53 +0000 (11:57 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 5 Feb 2016 11:57:54 +0000 (11:57 +0000)

Trivial merge