Merge branch 'MDL-52934-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 15 Mar 2016 00:58:33 +0000 (08:58 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 15 Mar 2016 00:58:33 +0000 (08:58 +0800)
commit03bd6c21add46b07da71cd5f468b3eafecc3469e
treeca277666bff87a5788a817f799d04fe38f21b321
parent01f8945b818a96cafa408b1e38b658db773f5b0d
parentbbd7f7f73af801dd59b5d31a906b06fe45114c0a
Merge branch 'MDL-52934-master' of git://github.com/FMCorz/moodle