]> git.parisson.com Git - pdf.js.git/commitdiff
Merge branch 'api' of https://github.com/mozilla/pdf.js into api
authorBrendan Dahl <brendan.dahl@gmail.com>
Mon, 16 Apr 2012 16:35:46 +0000 (09:35 -0700)
committerBrendan Dahl <brendan.dahl@gmail.com>
Mon, 16 Apr 2012 16:35:46 +0000 (09:35 -0700)

Trivial merge