Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-02-17 ebbe6374fc9c308daf729d2ad1b2f8007ed771ce

 install/tpl/mysql-virtual_forwardings.cf.master

@@ -4,5 +4,6 @@
table = mail_forwarding
select_field = destination
where_field = source
additional_conditions = and active = 'y' and server_id = {server_id}
additional_conditions = and type != 'aliasdomain' and active = 'y' and server_id = {server_id}
# additional_conditions = and active = 'y' and server_id = {server_id}
hosts = {mysql_server_ip}