Merge branch 'stable-3.1'

Marius Burkard

2016-02-12 b0f818efec0b74741d6fa53d0e86a95065d4e2d1

 interface/web/vm/lib/lang/de_openvz_template.lng

@@ -90,4 +90,8 @@
$wb['swappages_error_empty'] = 'Swappages ist leer.';
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Erweitert';
$wb['features_txt'] = 'Features';
$wb['iptables_txt'] = 'IP Tables';
$wb['custom_txt'] = 'Custom settings';
$wb['custom_error'] = 'Not allowed in Custom settings: ';
?>