Chris Cormack 0c40ff9f98 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		2012-03-22 09:36:55 +13:00
..
0001-bug_2929-permit_to_define_fine_days_in_issuing_rules.pl
0004-Add_Some_Missing_fields_to_suggestions.pl
0005-Add_CAS_Configuration.pl
0007-Opac-search-history.pl
0008-opac-description-for-authorised-values.pl
0009-patron-attr-display-checkout.pl
bug_6843_Renew_membership_from_expiry_or_current_date.pl
bug_7144-add-returnbranch-to-branch-item-issuing-rules.pl
bug_7284_authority_linking_pt1
bug_7284_authority_linking_pt2
hourlyloans.sql
issuedate_times.pl
local_cover_images.pl
oai_sets.sql
subscription_add_enddate.pl