]> git.parisson.com Git - pdf.js.git/commitdiff
Merge remote-tracking branch 'upstream/master' into dev
authorKalervo Kujala <kkujala@com>
Mon, 9 Jan 2012 18:39:05 +0000 (20:39 +0200)
committerKalervo Kujala <kkujala@com>
Mon, 9 Jan 2012 18:39:05 +0000 (20:39 +0200)

Trivial merge