Yury Delendik 296b98f977 Merge branch 'master' of git://github.com/mozilla/pdf.js.git into progress-indeterminate ... Conflicts: extensions/firefox/components/PdfStreamConverter.js		2012-08-23 15:23:44 -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 progress-indeterminate	2012-08-23 15:23:44 -05:00