From: Yury Delendik <ydelendik@mozilla.com>
Date: Thu, 3 May 2012 16:34:07 +0000 (-0500)
Subject: Merge remote-tracking branch 'mozilla/l10n' into l10n
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=cf0fc7e2098089aa827eb3a1322cdabeb071e87e;p=pdf.js.git

Merge remote-tracking branch 'mozilla/l10n' into l10n

Conflicts:
	web/locale.properties
---

cf0fc7e2098089aa827eb3a1322cdabeb071e87e