Merge "Adding floatingip_start and floatingip_end to heat template."
authorJenkins <jenkins@review.openstack.org>
Wed, 19 Jun 2013 22:23:37 +0000 (22:23 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 19 Jun 2013 22:23:37 +0000 (22:23 +0000)

Trivial merge