]> git.parisson.com Git - pdf.js.git/commitdiff
Merge remote branch 'upstream/master'
authorRob Sayre <sayrer@gmail.com>
Thu, 23 Jun 2011 20:49:16 +0000 (13:49 -0700)
committerRob Sayre <sayrer@gmail.com>
Thu, 23 Jun 2011 20:49:16 +0000 (13:49 -0700)

Trivial merge