Merge branch 'm29_MDL-48359' of https://github.com/totara/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Dec 2014 17:19:37 +0000 (17:19 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 11:37:52 +0000 (11:37 +0000)
commit63015d84c30cab77d81d361116830bf2e38339ca
tree6b0bb1271ea89b47dccebcfbc507ab6feef95ed0
parent7dad52f704b780791433b4f126e91a5d73595539
parente45d9cd9bcc2acfed80689b2050adedf784d57b8
Merge branch 'm29_MDL-48359' of https://github.com/totara/moodle