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
..
intranet-tmpl/prog	Merge remote-tracking branch 'kc/master' into merged_5549	2012-03-22 09:36:55 +13:00
opac-tmpl/prog	Bug 7310: Code changes for Improving list permissions	2012-03-21 16:46:40 +01:00
favicon.ico
index.html
intranet.html
opac.html
templates.readme