Merge branch 'stable-3.1'

Marius Burkard

2016-01-18 b6a0ab059e67975984633b1a99446818b3e9ee59

1
2
3
4
5
# Format: usertype:url_path:field
# usertype can be: any/client/admin
# Example:
# admin:/admin/language_edit.php:POST.records.weak_password_txt
admin:/admin/language_edit.php:POST.records