Merge remote branch 'kc/master' into new/enh/bug_5917
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 5 Apr 2011 03:39:12 +0000 (15:39 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 5 Apr 2011 03:39:12 +0000 (15:39 +1200)
commit363ea5ce08c6e7c729a3d407b498bf89ea8a9d25
treef3361decc219218859bcf670e48dc444c6ad3a67
parent4273c02ba1c0d71bb07c3a0b33ce76fae72a5917
parentf1869ec06407dcca8c8d29cf06fd342b203ee758
Merge remote branch 'kc/master' into new/enh/bug_5917

Conflicts:
installer/data/mysql/updatedatabase.pl
C4/Auth.pm
installer/data/mysql/updatedatabase.pl
koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc