Chris Cormack a4b2280b6b Merge remote branch 'kc/new/bug_3670' into kcmaster ... Conflicts: koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc		2011-03-27 21:19:24 +13:00
..
css	Merge remote branch 'kc/new/enh/bug_3659' into kcmaster	2011-03-15 15:58:26 +13:00
includes	Merge remote branch 'kc/new/bug_3670' into kcmaster	2011-03-27 21:19:24 +13:00
js	Bug 5466 - Acquisitions - ability to set currency in order screens	2011-03-21 16:51:40 +13:00
lib	Merge remote branch 'kc/new/enh/bug_3659' into kcmaster	2011-03-15 15:58:26 +13:00
modules	Merge remote branch 'kc/new/enh/bug_1962' into kcmaster	2011-03-27 21:12:40 +13:00
xslt	Bug 5954: 490$a not used to create search link in XSLT	2011-03-27 21:02:33 +13:00
columns.def	Removed two column definitions added in previous patch	2010-11-10 19:38:34 +13:00