]> git.parisson.com Git - pdf.js.git/commitdiff
Merge upstream/master.
author= <=>
Thu, 20 Oct 2011 23:56:30 +0000 (16:56 -0700)
committer= <=>
Thu, 20 Oct 2011 23:56:30 +0000 (16:56 -0700)
1  2 
pdf.js

diff --cc pdf.js
Simple merge