Merge branch 'MDL-52952-master' of https://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 06:44:15 +0000 (14:44 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 06:44:15 +0000 (14:44 +0800)
commit3a0b30c7c74bf58e0130c5bfef4f0137ab15726d
tree4713a3798581ac45156a6ad6856f2f901d09e86d
parent5821479ef62210f686ec9331203f1c7f3799dab9
parent67cdf4efaeba6275ca7207936b4c815706af19fb
Merge branch 'MDL-52952-master' of https://github.com/xow/moodle