Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-30 f686264ad6d82cfaf4e401da2e259880f57bfade

 interface/web/mail/lib/lang/id_mail_alias_list.lng

@@ -1,8 +1,8 @@
<?php

$wb["list_head_txt"] = 'Email Alias';

$wb["active_txt"] = 'Active';

$wb["source_txt"] = 'source';

$wb["destination_txt"] = 'Destination';

$wb["email_txt"] = 'Email';

$wb["add_new_record_txt"] = 'Add new Email alias';

?>
<?php
$wb['list_head_txt'] = 'Email Alias';
$wb['active_txt'] = 'Active';
$wb['source_txt'] = 'source';
$wb['destination_txt'] = 'Destination';
$wb['email_txt'] = 'Email';
$wb['add_new_record_txt'] = 'Add new Email alias';
?>