Yury Delendik cf0fc7e209 Merge remote-tracking branch 'mozilla/l10n' into l10n
Conflicts:
	web/locale.properties
2012-05-03 11:34:07 -05:00
..
2012-05-02 17:42:08 +01:00
2012-05-02 11:27:12 -07:00
2012-05-02 19:12:04 +02:00
2012-05-03 12:31:14 -04:00
2012-05-02 15:14:27 -05:00