Merge branch 'MDL-52702-m' of https://github.com/micaherne/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 20 Jan 2016 14:37:17 +0000 (14:37 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 20 Jan 2016 14:37:17 +0000 (14:37 +0000)
1  2 
lang/en/admin.php

Simple merge