Alena Prokharchyk 56d94fc074 Merge branch 'master' into internallb1 ... Conflicts: plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java server/src/com/cloud/network/vpc/VpcManagerImpl.java		2013-05-09 10:21:34 -07:00
..
src/com/cloud	Merge branch 'master' into internallb1	2013-05-09 10:21:34 -07:00
pom.xml	Switching netscaler to the maven location of the	2013-04-08 12:34:57 +02:00