]> git.parisson.com Git - pdf.js.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorKalervo Kujala <kkujala@com>
Wed, 19 Oct 2011 18:28:03 +0000 (21:28 +0300)
committerKalervo Kujala <kkujala@com>
Wed, 19 Oct 2011 18:28:03 +0000 (21:28 +0300)

Trivial merge