Commit 8f781fdc authored by Benoit Mortier's avatar Benoit Mortier
Browse files

Merge branch '1.0.9'


Signed-off-by: default avatarBenoit Mortier <benoit.mortier@opensides.be>

Conflicts:
	asterisk/admin/systems/asterisk/phonesettings.tpl
	asterisk/config/asterisk/class_asteriskPluginConfig.inc
	asterisk/locale/ar/fusiondirectory.po
	asterisk/locale/ca/fusiondirectory.po
	asterisk/locale/cs_CZ/fusiondirectory.po
	asterisk/locale/de/fusiondirectory.po
	asterisk/locale/en/fusiondirectory.po
	asterisk/locale/es/fusiondirectory.po
	asterisk/locale/es_VE/fusiondirectory.po
	asterisk/locale/fa_IR/fusiondirectory.po
	asterisk/locale/fr/fusiondirectory.po
	asterisk/locale/id/fusiondirectory.po
	asterisk/locale/it/fusiondirectory.po
	asterisk/locale/lv/fusiondirectory.po
	asterisk/locale/nb/fusiondirectory.po
	asterisk/locale/nl/fusiondirectory.po
	asterisk/locale/pl/fusiondirectory.po
	asterisk/locale/pt/fusiondirectory.po
	asterisk/locale/pt_BR/fusiondirectory.po
	asterisk/locale/ru/fusiondirectory.po
	asterisk/locale/ru@petr1708/fusiondirectory.po
	asterisk/locale/sv/fusiondirectory.po
	asterisk/locale/ug/fusiondirectory.po
	asterisk/locale/vi_VN/fusiondirectory.po
	asterisk/locale/zh/fusiondirectory.po
	fax/config/fax/class_faxConfig.inc
	fax/locale/ar/fusiondirectory.po
	fax/locale/ca/fusiondirectory.po
	fax/locale/cs_CZ/fusiondirectory.po
	fax/locale/de/fusiondirectory.po
	fax/locale/en/fusiondirectory.po
	fax/locale/es/fusiondirectory.po
	fax/locale/es_VE/fusiondirectory.po
	fax/locale/fa_IR/fusiondirectory.po
	fax/locale/fr/fusiondirectory.po
	fax/locale/id/fusiondirectory.po
	fax/locale/it/fusiondirectory.po
	fax/locale/lv/fusiondirectory.po
	fax/locale/nb/fusiondirectory.po
	fax/locale/nl/fusiondirectory.po
	fax/locale/pl/fusiondirectory.po
	fax/locale/pt/fusiondirectory.po
	fax/locale/pt_BR/fusiondirectory.po
	fax/locale/ru/fusiondirectory.po
	fax/locale/ru@petr1708/fusiondirectory.po
	fax/locale/sv/fusiondirectory.po
	fax/locale/ug/fusiondirectory.po
	fax/locale/vi_VN/fusiondirectory.po
	fax/locale/zh/fusiondirectory.po
	kolab/locale/ar/fusiondirectory.po
	kolab/locale/ca/fusiondirectory.po
	kolab/locale/cs_CZ/fusiondirectory.po
	kolab/locale/de/fusiondirectory.po
	kolab/locale/en/fusiondirectory.po
	kolab/locale/es/fusiondirectory.po
	kolab/locale/es_VE/fusiondirectory.po
	kolab/locale/fa_IR/fusiondirectory.po
	kolab/locale/fr/fusiondirectory.po
	kolab/locale/id/fusiondirectory.po
	kolab/locale/it/fusiondirectory.po
	kolab/locale/lv/fusiondirectory.po
	kolab/locale/nb/fusiondirectory.po
	kolab/locale/nl/fusiondirectory.po
	kolab/locale/pl/fusiondirectory.po
	kolab/locale/pt/fusiondirectory.po
	kolab/locale/pt_BR/fusiondirectory.po
	kolab/locale/ru/fusiondirectory.po
	kolab/locale/ru@petr1708/fusiondirectory.po
	kolab/locale/sv/fusiondirectory.po
	kolab/locale/ug/fusiondirectory.po
	kolab/locale/vi_VN/fusiondirectory.po
	kolab/locale/zh/fusiondirectory.po
	openstack-compute/locale/ar/fusiondirectory.po
	openstack-compute/locale/ca/fusiondirectory.po
	openstack-compute/locale/cs_CZ/fusiondirectory.po
	openstack-compute/locale/de/fusiondirectory.po
	openstack-compute/locale/en/fusiondirectory.po
	openstack-compute/locale/es/fusiondirectory.po
	openstack-compute/locale/es_VE/fusiondirectory.po
	openstack-compute/locale/fa_IR/fusiondirectory.po
	openstack-compute/locale/fr/fusiondirectory.po
	openstack-compute/locale/id/fusiondirectory.po
	openstack-compute/locale/it/fusiondirectory.po
	openstack-compute/locale/lv/fusiondirectory.po
	openstack-compute/locale/nb/fusiondirectory.po
	openstack-compute/locale/nl/fusiondirectory.po
	openstack-compute/locale/pl/fusiondirectory.po
	openstack-compute/locale/pt/fusiondirectory.po
	openstack-compute/locale/pt_BR/fusiondirectory.po
	openstack-compute/locale/ru/fusiondirectory.po
	openstack-compute/locale/ru@petr1708/fusiondirectory.po
	openstack-compute/locale/sv/fusiondirectory.po
	openstack-compute/locale/ug/fusiondirectory.po
	openstack-compute/locale/vi_VN/fusiondirectory.po
	openstack-compute/locale/zh/fusiondirectory.po
	uw-imap/locale/ar/fusiondirectory.po
	uw-imap/locale/ca/fusiondirectory.po
	uw-imap/locale/cs_CZ/fusiondirectory.po
	uw-imap/locale/de/fusiondirectory.po
	uw-imap/locale/en/fusiondirectory.po
	uw-imap/locale/es/fusiondirectory.po
	uw-imap/locale/es_VE/fusiondirectory.po
	uw-imap/locale/fa_IR/fusiondirectory.po
	uw-imap/locale/fr/fusiondirectory.po
	uw-imap/locale/id/fusiondirectory.po
	uw-imap/locale/it/fusiondirectory.po
	uw-imap/locale/lv/fusiondirectory.po
	uw-imap/locale/nb/fusiondirectory.po
	uw-imap/locale/nl/fusiondirectory.po
	uw-imap/locale/pl/fusiondirectory.po
	uw-imap/locale/pt/fusiondirectory.po
	uw-imap/locale/pt_BR/fusiondirectory.po
	uw-imap/locale/ru/fusiondirectory.po
	uw-imap/locale/ru@petr1708/fusiondirectory.po
	uw-imap/locale/sv/fusiondirectory.po
	uw-imap/locale/ug/fusiondirectory.po
	uw-imap/locale/vi_VN/fusiondirectory.po
	uw-imap/locale/zh/fusiondirectory.po
Showing with 1312 additions and 952 deletions
+1312 -952
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment