]> git.parisson.com Git - pdf.js.git/commitdiff
Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into decryptstream
authornotmasteryet <async.processingjs@yahoo.com>
Sat, 25 Jun 2011 03:28:34 +0000 (22:28 -0500)
committernotmasteryet <async.processingjs@yahoo.com>
Sat, 25 Jun 2011 03:28:34 +0000 (22:28 -0500)

Trivial merge