From: Pasi Kallinen <pasi.kallinen@pttk.fi>
Date: Mon, 3 Jun 2013 08:47:53 +0000 (+0300)
Subject: Merge branch 'user/paxed/i18n-xul-values' of git://git.evergreen-ils.org/working... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fuser%2Fpaxed%2Fi18n-xul-values;p=working%2FEvergreen.git

Merge branch 'user/paxed/i18n-xul-values' of git://git.evergreen-ils.org/working/Evergreen into i18n-xul-values

Signed-off-by: Pasi Kallinen <pasi.kallinen@pttk.fi>

Conflicts:
	Open-ILS/web/opac/locale/en-US/lang.dtd
	Open-ILS/xul/staff_client/server/serial/manage_subs.xul
---

902e5428fbc4d0df7e9293975566621cc7457da2