Brian Federle e901b824ec Merge branch 'master' into ui-restyle ... Conflicts: client/WEB-INF/classes/resources/messages.properties ui/dictionary.jsp		2013-10-14 10:16:22 -07:00
..
classes/resources	Merge branch 'master' into ui-restyle	2013-10-14 10:16:22 -07:00
web.xml	CLOUDSTACK-3438: update CPVM SSL certificate for both Premium and non-Premium cases	2013-07-10 12:20:57 +02:00