Chris Cormack 03890c90ac Merge remote branch 'kc/master' into new/enh/bug_5917 ... Conflicts: installer/data/mysql/en/mandatory/sysprefs.sql		2011-03-21 19:54:11 +13:00
..
en	Merge remote branch 'kc/master' into new/enh/bug_5917	2011-03-21 19:54:11 +13:00
famfamfam	Merge remote branch 'colin/QA/bug_4506' into new/enh/bug_4506	2010-12-14 21:07:15 +13:00
images	Fix for Bug 3347 - Inconsistencies with tables in opac-shelves.tmpl	2011-01-06 08:40:49 +13:00
itemtypeimg	Bug 5792 - Add reference icon to Bridge icon set	2011-03-04 12:54:20 +13:00