]> git.parisson.com Git - pdf.js.git/commitdiff
Merge remote-tracking branch 'upstream/master' into refactor
authorKalervo Kujala <kkujala@com>
Thu, 5 Jan 2012 20:24:35 +0000 (22:24 +0200)
committerKalervo Kujala <kkujala@com>
Thu, 5 Jan 2012 20:24:35 +0000 (22:24 +0200)

Trivial merge