Merge branch 'MDL-52902-30' of git://github.com/jleyva/moodle into MOODLE_30_STABLE
commit5ed3f867eb8f10038e865750b83706b692abee7d
authorDavid Monllao <davidm@moodle.com>
Tue, 9 Feb 2016 06:45:19 +0000 (9 14:45 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 9 Feb 2016 08:40:19 +0000 (9 16:40 +0800)
treedca3b1211fb92ac68aec83b2c660f52ce45157f6
parent80e7dc9740c30e8512c6eeb3e3cea0df26c3158e
parent3b5f57029b64afb52505c3b4c1a11d67eb70f177
Merge branch 'MDL-52902-30' of git://github.com/jleyva/moodle into MOODLE_30_STABLE