Yury Delendik 9cc5fc4e38 Merge branch 'master' of git://github.com/mozilla/pdf.js.git into loadingbychrome ... Conflicts: web/viewer.js		2012-08-15 10:17:30 -05:00
..
chrome	Loading extension resources via stringbundle	2012-05-11 14:39:11 -05:00
firefox	Merge branch 'master' of git://github.com/mozilla/pdf.js.git into loadingbychrome	2012-08-15 10:17:30 -05:00