From: Yury Delendik <ydelendik@mozilla.com>
Date: Tue, 17 Apr 2012 21:54:09 +0000 (-0500)
Subject: Merge branch 'master' of git://github.com/mozilla/pdf.js.git into update-md5-2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b3c7766bb9ab25e681f0eeab7132449e50232637;p=pdf.js.git

Merge branch 'master' of git://github.com/mozilla/pdf.js.git into update-md5-2

Conflicts:
	test/test_manifest.json
---

b3c7766bb9ab25e681f0eeab7132449e50232637