Merge branch 'MDL-46963-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 15 Apr 2015 05:35:37 +0000 (13:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 15 Apr 2015 05:35:37 +0000 (13:35 +0800)
commite256b59702a25eba66af06458ac57cc95ec8e442
tree490e1968796f6c2c2899e90507530f9accdf9b94
parent9b67b43b21fa2a03618ad80a0d58ec1f81f178c8
parent9b8104ce9bd655c544d0cfe0330e8f86ae0a4e04
Merge branch 'MDL-46963-master' of git://github.com/lameze/moodle
lang/en/admin.php