]> git.parisson.com Git - pdf.js.git/commitdiff
Merge branch 'master' of https://github.com/mozilla/pdf.js into string_fontname
authorBrendan Dahl <brendan.dahl@gmail.com>
Mon, 19 Mar 2012 02:57:28 +0000 (19:57 -0700)
committerBrendan Dahl <brendan.dahl@gmail.com>
Mon, 19 Mar 2012 02:57:28 +0000 (19:57 -0700)

Trivial merge