Merge "add 'editprotected' right to list of available rights"
authorAaron Schulz <aschulz@wikimedia.org>
Mon, 13 Aug 2012 20:52:11 +0000 (20:52 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 13 Aug 2012 20:52:11 +0000 (20:52 +0000)
1  2 
includes/User.php

Simple merge