Merge branch 'stable-3.1'

Marius Burkard

2016-07-05 165177508f6541b4d0924c6625eb216a9a5a549a

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