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

Trivial merge