Merge branch 'MDL-52347_master-fix' of git://github.com/dmonllao/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 31 Dec 2015 05:20:40 +0000 (13:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 31 Dec 2015 05:20:40 +0000 (13:20 +0800)
commitd6024b8493e038856ae968aa6f38bcd29e1f3d0b
treef9155da7481ebd147da0e25641384e541decf818
parent53a2405c9c9a2cb0414e36df3667acec0214cd40
parent19a1973a9a6f4064de900e46ebcce7d874f5f274
Merge branch 'MDL-52347_master-fix' of git://github.com/dmonllao/moodle