-
Conflicts: asterisk/addons/fonreports/class_fonreport.inc asterisk/addons/fonreports/contents.tpl asterisk/admin/conference/conf-filter.tpl asterisk/admin/conference/generic.tpl asterisk/admin/macro/macro-filter.tpl systems/admin/systems/class_workstationGeneric.inc systems/admin/systems/phoneSelect/phoneSelect-filter.tpl systems/admin/systems/ppd/class_printerPPDSelectionDialog.inc systems/admin/systems/ppd/printerPPDSelectionDialog.tpl systems/admin/systems/system-filter.tpl
475e49f9