Merge branch 'MDL-52902-master' of git://github.com/jleyva/moodle
commitba4fd381e0a16766a06feaa9e3895af662fe2570
authorDavid Monllao <davidm@moodle.com>
Tue, 9 Feb 2016 06:45:29 +0000 (9 14:45 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 9 Feb 2016 08:36:57 +0000 (9 16:36 +0800)
treea873c47dbb9a17463a92313d95f32b30b177319e
parentf79dd94b59362cd3b076208eb37f2cad3e53fe52
parent51d2434cfede4d1623c00f3f3a4534988ac053ec
Merge branch 'MDL-52902-master' of git://github.com/jleyva/moodle