первый
второй
Merge branch 'master' of https://github.com/WMTV/oranger

Conflicts:
	mysql/oranger/do77s_acymailing_config.MYI
	mysql/oranger/do77s_acymailing_fields.MYI
	mysql/oranger/do77s_acymailing_filter.MYI
	mysql/oranger/do77s_acymailing_history.MYI
	mysql/oranger/do77s_acymailing_list.MYI
	mysql/oranger/do77s_acymailing_listcampaign.MYI
	mysql/oranger/do77s_acymailing_listmail.MYI
	mysql/oranger/do77s_acymailing_listsub.MYI
	mysql/oranger/do77s_acymailing_mail.MYI
	mysql/oranger/do77s_acymailing_queue.MYI
	mysql/oranger/do77s_acymailing_rules.MYI
	mysql/oranger/do77s_acymailing_stats.MYI
	mysql/oranger/do77s_acymailing_subscriber.MYI
	mysql/oranger/do77s_acymailing_template.MYI
	mysql/oranger/do77s_acymailing_url.MYI
	mysql/oranger/do77s_acymailing_urlclick.MYI
	mysql/oranger/do77s_acymailing_userstats.MYI
	mysql/oranger/do77s_jxtc_ezimg_images.MYI
	mysql/oranger/do77s_jxtc_readinglist.MYI