Brian Federle 698a1bb3cd Merge branch 'master' of git.cloud.com:/var/lib/git/cloudstack-oss ...

Conflicts:
	client/WEB-INF/classes/resources/messages.properties

2012-03-28 15:03:17 -07:00

..

messages_es.properties

cloudstack 3.0 new UI - localization - add template action.

2012-02-07 12:30:30 -08:00

messages_ja.properties

cloudstack 3.0 UI - more labels translated.

2012-03-21 09:50:13 -07:00

messages_zh_CN.properties

cloudstack 3.0 UI - check in Chinese translation.

2012-03-23 10:00:18 -07:00

messages.properties

Merge branch 'master' of git.cloud.com:/var/lib/git/cloudstack-oss

2012-03-28 15:03:17 -07:00