]> git.parisson.com Git - pdf.js.git/commitdiff
Merge remote-tracking branch 'upstream/master' into test
authorKalervo Kujala <kkujala@com>
Sun, 20 Nov 2011 18:03:11 +0000 (20:03 +0200)
committerKalervo Kujala <kkujala@com>
Sun, 20 Nov 2011 18:03:11 +0000 (20:03 +0200)

Trivial merge