Merge commit 'f2e0fb509a' into WebGUI8. Some tests still failing.

This commit is contained in:
Colin Kuskie 2010-06-27 22:32:31 -07:00
commit 385931aaab
92 changed files with 1966 additions and 650 deletions

View file

@ -808,7 +808,7 @@
"BackToSite" : "BackToSite",
"CanEditText" : "CanEditText",
"CartItemCount" : "CartItemCount",
"ConvertToUTC" : "ConvertToUTC",
"ConvertUTCToTZ" : "ConvertUTCToTZ",
"c" : "c_companyName",
"D" : "D_date",
"DeactivateAccount": "DeactivateAccount",