]> git.parisson.com Git - pdf.js.git/commitdiff
Merge remote-tracking branch 'upstream/master' into boundingbox
author= <=>
Thu, 6 Oct 2011 23:19:46 +0000 (16:19 -0700)
committer= <=>
Thu, 6 Oct 2011 23:19:46 +0000 (16:19 -0700)

Trivial merge