Merge branch 'stable-3.1'

Marius Burkard

2016-03-02 2f74cf27ad6fbb852df78bcccca1fb645c8a57e0

 install/tpl/mysql-virtual_relayrecipientmaps.cf.master

@@ -4,5 +4,5 @@
table = mail_relay_recipient
select_field = access
where_field = source
additional_conditions = and active = 'y'
additional_conditions = and active = 'y' and server_id = {server_id}
hosts = {mysql_server_ip}