Merge branch 'master' into 'master'

Marius Cramer

2014-10-24 2d5fcd53c19a65b9c968a1db2e9af643537379c3

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