]> git.parisson.com Git - pdf.js.git/commitdiff
Merge branch 'master' of git://github.com/andreasgal/pdf.js into issue-155
authorChris Jones <jones.chris.g@gmail.com>
Sat, 2 Jul 2011 05:19:11 +0000 (22:19 -0700)
committerChris Jones <jones.chris.g@gmail.com>
Sat, 2 Jul 2011 05:19:11 +0000 (22:19 -0700)

Trivial merge