Merge branch 'master' of https://github.com/andreasgal/pdf.js

diff --cc fonts.js
index df1795177610ee2eff00a8ae9e28679d32cbdc6a,f154cddf4a13681495c7fd23637b7c75f866ec99..5a7a41c0fe6f2d07e142e77c92bffc060d2cea4f
--- 1/fonts.js
--- 2/fonts.js
+++ b/fonts.js
@@@ -1025,9 -844,9 +1038,9 @@@ var Font = (function () 
              warn("Is " + fontName + " loaded?");
            }
          }
 -        
 +
          window.clearInterval(interval);
-         Fonts[fontName].loading = false;
+         Fonts.lookup(fontName).loading = false;
          this.start = 0;
          if (callback) {
            callback();

diff --cc pdf.js
Simple merge