]> git.parisson.com Git - pdf.js.git/commitdiff
Merge remote branch 'upstream/master'
authorRob Sayre <sayrer@gmail.com>
Tue, 5 Jul 2011 23:06:10 +0000 (16:06 -0700)
committerRob Sayre <sayrer@gmail.com>
Tue, 5 Jul 2011 23:06:10 +0000 (16:06 -0700)

Trivial merge