Merge "Fix bash env var conditionals in merge.py call to be consistent"
authorJenkins <jenkins@review.openstack.org>
Mon, 18 Aug 2014 22:15:14 +0000 (22:15 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 18 Aug 2014 22:15:14 +0000 (22:15 +0000)

Trivial merge