]> git.parisson.com Git - pdf.js.git/commitdiff
Merge upstream
authorVivien Nicolas <21@vingtetun.org>
Sun, 6 Nov 2011 15:36:54 +0000 (16:36 +0100)
committerVivien Nicolas <21@vingtetun.org>
Sun, 6 Nov 2011 15:36:54 +0000 (16:36 +0100)

Trivial merge