Revert "Merge branch 'wip-MDL-40356-master' of git://github.com/abgreeve/moodle"
commite0dfc380c6d97d18c6a7ca69e09751c6ce323abb
authorMarina Glancy <marina@moodle.com>
Thu, 11 Sep 2014 02:54:40 +0000 (11 10:54 +0800)
committerMarina Glancy <marina@moodle.com>
Thu, 11 Sep 2014 02:54:40 +0000 (11 10:54 +0800)
tree25399dfba624dff40b21bc890d45bcaadb572860
parent54e6e19a47df26c8f4992edd1bb8d8d5e90e2fd7
Revert "Merge branch 'wip-MDL-40356-master' of git://github.com/abgreeve/moodle"

This reverts commit 4b5fd6eb6d34b5c519d778a8d9c5c1a014146f54, reversing
changes made to a788aade7ce694b3f36c8e27295c60a5178c5b23.
admin/settings/users.php
lang/en/admin.php
lib/moodlelib.php
lib/tests/moodlelib_test.php