Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x

This commit is contained in:
Pranav Saxena 2012-05-24 16:25:46 +05:30
commit 9a22bbe184
1 changed files with 1 additions and 1 deletions

View File

@ -1662,7 +1662,7 @@ dictionary = {
'label.ipaddress': '<fmt:message key="label.ipaddress"/>',
'label.vcdcname': '<fmt:message key="label.vcdcname"/>',
'label.vcipaddress': '<fmt:message key="label.vcipaddress"/>',
'label.vsmclrlvlanid': '<fmt:message key="label.vsmctrlvlanid"/>',
'label.vsmctrlvlanid': '<fmt:message key="label.vsmctrlvlanid"/>',
'label.vsmpktvlanid': '<fmt:message key="label.vsmpktvlanid"/>',
'label.vsmstoragevlanid': '<fmt:message key="label.vsmstoragevlanid"/>',
'message.specify.url': '<fmt:message key="message.specify.url"/>',