]> git.parisson.com Git - pdf.js.git/commitdiff
Merge remote branch 'upstream/master'
authorRob Sayre <sayrer@gmail.com>
Sun, 26 Jun 2011 18:10:47 +0000 (11:10 -0700)
committerRob Sayre <sayrer@gmail.com>
Sun, 26 Jun 2011 18:10:47 +0000 (11:10 -0700)

Trivial merge