Merge remote branch 'kc/new/bug_3670' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 27 Mar 2011 08:19:24 +0000 (21:19 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 27 Mar 2011 08:19:24 +0000 (21:19 +1300)
commita4b2280b6be100727e5d6f85b9e6fe58392febf0
treeaf4c614bd407f3694d4f0ec0ad66d33826ac3803
parent4669a10776ff958a3b2d51963b7c4ec90ec02f09
parent3884e1693fcab4615362cb339262bb160479ccdc
Merge remote branch 'kc/new/bug_3670' into kcmaster

Conflicts:
koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc