]> git.parisson.com Git - pdf.js.git/commitdiff
Merge branch 'master' of https://github.com/mozilla/pdf.js into nativedecode
authorBrendan Dahl <brendan.dahl@gmail.com>
Wed, 4 Jan 2012 19:25:46 +0000 (11:25 -0800)
committerBrendan Dahl <brendan.dahl@gmail.com>
Wed, 4 Jan 2012 19:25:46 +0000 (11:25 -0800)

Trivial merge