Merge branch 'MDL-54180_master' of https://github.com/marxjohnson/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 7 Jun 2016 08:15:43 +0000 (16:15 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 7 Jun 2016 08:15:43 +0000 (16:15 +0800)
commit8a4f4f576ed2a232f86359d6e95e8a47bb1f8fb4
treebe9f59ba7108a7d51f878e5345d898ae650cac84
parent31220d5a26ca4a233b2954df939e72d34202661f
parentbe8b89500c47a6155239977da71fa56c3d6ec17b
Merge branch 'MDL-54180_master' of https://github.com/marxjohnson/moodle