Merge remote-tracking branch 'kc/master' into merged_5549
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 21 Mar 2012 20:36:55 +0000 (09:36 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 21 Mar 2012 20:36:55 +0000 (09:36 +1300)
commit0c40ff9f9814295fe27f52047bfbe4ef7b47e78b
tree073a2d855057b607b78baa57e6fd3cdd2b34a617
parent28309bc61e0d2ba687f40dc8a59dc9f29044e681
parent58e3065af4168a39d4af01eeee6ee7bad6db57ce
Merge remote-tracking branch 'kc/master' into merged_5549

Fixed conflicts

Conflicts:
catalogue/moredetail.pl
installer/data/mysql/updatedatabase.pl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
C4/Circulation.pm
admin/smart-rules.pl
catalogue/moredetail.pl
circ/overdue.pl
installer/data/mysql/kohastructure.sql
installer/data/mysql/updatedatabase.pl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
opac/opac-reserve.pl
opac/opac-user.pl