Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Dec 2013 02:07:10 +0000 (10:07 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Dec 2013 02:07:10 +0000 (10:07 +0800)
commit8d8e6f9607bbbc66d8d4bf2ee273f4de849387e6
treebd88657320e1f3b0de19b0ba599639e40c62779c
parent13410584be25c6e8edc23f71ffbeb5dbbd00769e
parentbb32a499e10abc3bb88e715fb0575e5b7fb66e8e
Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle
lang/en/admin.php