Merge "add 'passwortreset' right to list of available rights"

diff --cc includes/User.php
index 40577fe,0511c98..55ef71e
--- 1/includes/User.php
--- 2/includes/User.php
+++ b/includes/User.php
@@@ -140,8 -140,8 +140,9 @@@ class User 
                'nominornewtalk',
                'noratelimit',
                'override-export-depth',
+               'passwordreset',
                'patrol',
 +              'patrolmarks',
                'protect',
                'proxyunbannable',
                'purge',