From: Adil Allawi <adil@diwan.com>
Date: Wed, 2 May 2012 15:59:25 +0000 (+0100)
Subject: Merge branch 'l10n' of https://github.com/mozilla/pdf.js into l10n
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2c6026512db4b937a4968024f3c05209552bd98e;p=pdf.js.git

Merge branch 'l10n' of https://github.com/mozilla/pdf.js into l10n

Conflicts:
	web/locale.properties
---

2c6026512db4b937a4968024f3c05209552bd98e
diff --cc web/locale.properties
index 4bfec97,0000000..e69de29
mode 100644,000000..100644
--- a/web/locale.properties
+++ b/web/locale.properties