Merge branch 'feature-floatingip-without-network' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 20 Feb 2014 09:37:07 +0000 (11:37 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 20 Feb 2014 09:37:07 +0000 (11:37 +0200)

Trivial merge