Merged branch 'w52_MDL-30548_m23_suspenduser' of git://github.com/skodak/moodle.git...
authorSam Hemelryk <sam@moodle.com>
Tue, 3 Jan 2012 21:50:20 +0000 (10:50 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 3 Jan 2012 21:50:20 +0000 (10:50 +1300)
commit44d5c138a2db40ddb10737535a29a47ef9c6e47a
treeb65e4faaf98998bfe8de7f67d51e7e7a1cd6cb6f
parent831e48be0184bcd266604d4ac81dc06125a5517a
parent4ad72c284d1d864060c4399150cf973e5f2abc4f
Merged branch 'w52_MDL-30548_m23_suspenduser' of git://github.com/skodak/moodle.git with conflict resolution
admin/settings/users.php
lang/en/admin.php