Merge "Fix to make it easy to use http proxy with Vagrant"
authorDamjan Marion <damarion@cisco.com>
Mon, 14 Dec 2015 23:28:14 +0000 (23:28 +0000)
committerGerrit Code Review <gerrit@projectrotterdam.info>
Mon, 14 Dec 2015 23:28:14 +0000 (23:28 +0000)

Trivial merge