Merge branch 'MDL-51818_M30' of git://github.com/lazydaisy/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 9 Feb 2016 04:24:24 +0000 (12:24 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 9 Feb 2016 04:24:24 +0000 (12:24 +0800)
commit332fb30a8d281b9641a60fac1b3a7100ad7b5b1f
treee01c96073bb02be07cf6c57875032647da2abac1
parentba4eaf0a349b450fafb87a588b6778d51d69ac08
parent5b9b4d02a25b36288e4b76c530a70b9ae4fbd28d
Merge branch 'MDL-51818_M30' of git://github.com/lazydaisy/moodle