Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-12 ae3e7aade5800213dd5c0a75f69344ce2097f35d

 interface/web/admin/lib/lang/br_directive_snippets.lng

@@ -6,4 +6,6 @@
$wb['active_txt'] = 'Active';
$wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
$wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
$wb['variables_txt'] = 'Variables';
$wb['customer_viewable_txt'] = 'Customer viewable';
?>