]> git.parisson.com Git - pdf.js.git/commitdiff
Merge branch 'master' of https://github.com/mozilla/pdf.js into progressbar
authorgigaherz <gigaherz@gmail.com>
Thu, 22 Mar 2012 21:50:22 +0000 (22:50 +0100)
committergigaherz <gigaherz@gmail.com>
Thu, 22 Mar 2012 21:50:22 +0000 (22:50 +0100)

Trivial merge