Yury Delendik 609b2a797e Merge remote-tracking branch 'mozilla/master' into textsearch ... Conflicts: l10n/en-US/viewer.properties web/viewer.html		2012-05-21 11:32:16 -05:00
..
metadata.inc	Move localization to l10n folders; create 'make locale'	2012-05-02 08:51:52 -05:00
viewer.properties	Merge remote-tracking branch 'mozilla/master' into textsearch	2012-05-21 11:32:16 -05:00