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
..
mysql	Merge remote-tracking branch 'kc/master' into merged_5549	2012-03-22 09:36:55 +13:00
Pg	Bug 7289: Adds editionstatement field in neworderempty	2012-02-17 11:13:34 +01:00