Merge branch 'MDL-52429-30' of git://github.com/jleyva/moodle into MOODLE_30_STABLE
commitd5d7d57d6d4c968c7fac9d6de4cb95f9f07eccda
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 09:17:10 +0000 (21 17:17 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 09:17:10 +0000 (21 17:17 +0800)
treedf4730422e9f9412fdb7493bbbbb314c105e7a65
parentdb3bcaba14537aed614d7d76591897a29a01aa05
parentd08bcc4ded16fef2a3c953151e2ddae763b93884
Merge branch 'MDL-52429-30' of git://github.com/jleyva/moodle into MOODLE_30_STABLE