]> git.parisson.com Git - pdf.js.git/commitdiff
Merge branch 'new-ui' of github.com:mozilla/pdf.js into new-ui2
authorBrendan Dahl <brendan.dahl@gmail.com>
Wed, 25 Apr 2012 21:32:04 +0000 (14:32 -0700)
committerBrendan Dahl <brendan.dahl@gmail.com>
Wed, 25 Apr 2012 21:32:04 +0000 (14:32 -0700)

Trivial merge