]> git.parisson.com Git - pdf.js.git/commitdiff
Merge remote branch 'upstream/master' into metrics
authorVivien Nicolas <21@vingtetun.org>
Thu, 22 Sep 2011 09:28:18 +0000 (11:28 +0200)
committerVivien Nicolas <21@vingtetun.org>
Thu, 22 Sep 2011 09:28:18 +0000 (11:28 +0200)

Trivial merge