]> git.parisson.com Git - pdf.js.git/commitdiff
Merge remote branch 'upstream/master' into extension_chrome
authorVivien Nicolas <21@vingtetun.org>
Wed, 19 Oct 2011 14:47:00 +0000 (16:47 +0200)
committerVivien Nicolas <21@vingtetun.org>
Wed, 19 Oct 2011 14:47:00 +0000 (16:47 +0200)

Trivial merge