From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Mon, 21 Mar 2011 06:54:11 +0000 (+1300)
Subject: Merge remote branch 'kc/master' into new/enh/bug_5917
X-Git-Tag: v3.04.00~195
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=03890c90ac41f66b2de04d0280e2e96a0d2e8be8;p=koha_fer

Merge remote branch 'kc/master' into new/enh/bug_5917

Conflicts:
	installer/data/mysql/en/mandatory/sysprefs.sql
---

03890c90ac41f66b2de04d0280e2e96a0d2e8be8