Merge branch 'MDL-51806_master' of https://github.com/snake/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 30 May 2016 02:51:33 +0000 (10:51 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 30 May 2016 02:51:33 +0000 (10:51 +0800)
commit5baf32c038a88e0b7cbeff13f42e21968c71e7c7
tree68fec59df30dd82d66721fd18cb3d71e00a46118
parent0196f0101c7b0b5621fa161ecf1df368e36c6765
parentf747f5a0d5afe60942aaa0a9fcc7099201718988
Merge branch 'MDL-51806_master' of https://github.com/snake/moodle