Juniper/contrail-web-controller — pull request #94 by manojgn (2014-06-11 10:08:48+00:00)
Title: Fixing the issue where floating ips were not getting displayed in vRouter Interfaces tab.

Conflicts:
webroot/monitor/infra/common/ui/js/monitor_infra_utils.js
webroot/monitor/infra/controlnode/ui/js/monitor_infra_controlnode_routes.js