From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Fri, 13 Apr 2012 21:20:32 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/api' into api
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=18a5e4f0c31cc7041e0f96fa52240d0cbe43774c;p=pdf.js.git

Merge remote-tracking branch 'upstream/api' into api
---

18a5e4f0c31cc7041e0f96fa52240d0cbe43774c