]> git.parisson.com Git - pdf.js.git/commit
Merge remote-tracking branch 'mozilla/l10n' into l10n
authorYury Delendik <ydelendik@mozilla.com>
Thu, 3 May 2012 16:34:07 +0000 (11:34 -0500)
committerYury Delendik <ydelendik@mozilla.com>
Thu, 3 May 2012 16:34:07 +0000 (11:34 -0500)
commitcf0fc7e2098089aa827eb3a1322cdabeb071e87e
tree37e4e16c8d96d4dbd103e37fc0879c65b707ddce
parentda4a2138533a06f0e2a1c69a472e50aec62946b4
parentecd62a38e003d846d59c7e3bee944659f2a857ce
Merge remote-tracking branch 'mozilla/l10n' into l10n

Conflicts:
web/locale.properties