]> git.parisson.com Git - pdf.js.git/commitdiff
Merge branch 'master' of github.com:andreasgal/pdf.js
authorsbarman <sbarman@L3CWZ5T.(none)>
Mon, 20 Jun 2011 21:59:58 +0000 (14:59 -0700)
committersbarman <sbarman@L3CWZ5T.(none)>
Mon, 20 Jun 2011 21:59:58 +0000 (14:59 -0700)

Trivial merge