Merge branch 'MDL-40912_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 15 Jan 2014 03:41:05 +0000 (11:41 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 15 Jan 2014 03:41:05 +0000 (11:41 +0800)
commitb19608d6828b8229cdb448eb817fb13eac4df746
treeb90227e55dfbeee46f38b2dd92d80778c2eea630
parent19c32aaceaf6c4663998680cdad6cc745bd52f07
parent001f09548d384195883e94c0b667891ce07253d3
Merge branch 'MDL-40912_master' of https://github.com/markn86/moodle
lang/en/moodle.php