]> git.parisson.com Git - pdf.js.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorKalervo Kujala <kkujala@com>
Tue, 27 Sep 2011 19:40:19 +0000 (22:40 +0300)
committerKalervo Kujala <kkujala@com>
Tue, 27 Sep 2011 19:40:19 +0000 (22:40 +0300)

Trivial merge