Merge branch 'MDL-51478-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 5 Oct 2015 05:38:43 +0000 (13:38 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 5 Oct 2015 05:38:43 +0000 (13:38 +0800)
commitb0fca9208b294eb086349a49f5c29deb46d208ae
tree151503b187d56419ed20c5f8805faafefc9d5fab
parent6ee188b162bd7fa232f39057bf6ae6b1cb738c22
parent6b6deb8e742b1bdc5a6bc854bb4373b02f4c0d96
Merge branch 'MDL-51478-master' of git://github.com/jleyva/moodle