Merge branch 'MDL-52335-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE
commit9887a4cbaebdb3204d1e81091fafcb724eda8afa
authorDavid Monllao <davidm@moodle.com>
Thu, 10 Dec 2015 07:48:28 +0000 (10 15:48 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 10 Dec 2015 07:48:28 +0000 (10 15:48 +0800)
treef7aee03d1a34776144e45465fa6529f22c0b7926
parent7d8fb1962e08aef377bf4875a525c2b53a8fa3a4
parentf3d159dea1673ca4917f695f2a2c0b0c9850397b
Merge branch 'MDL-52335-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE