Merge branch 'MDL-48559-master' of git://github.com/ankitagarwal/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Feb 2015 08:51:51 +0000 (16:51 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Feb 2015 08:51:51 +0000 (16:51 +0800)
commita27b8c9b3bed1a49c65f15d766c97bf207317ce4
tree3dfd9633832db19226034d8f084be721c520c941
parent73152e4dffcf11a9e1e7bbe1190e1d492c676849
parent1ae85f2184b25b96f0922c4127f1b92c5db084af
Merge branch 'MDL-48559-master' of git://github.com/ankitagarwal/moodle
lang/en/admin.php