Merge branch 'MDL-52786-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 9 Mar 2016 07:29:02 +0000 (15:29 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 9 Mar 2016 07:29:02 +0000 (15:29 +0800)
commitda51a9be95974fe52b395b280a2d7c68d805e3c7
treedfe6cb2e679e4c0b54d62c852ede756411f8385c
parentba8afbdb073abe5ac038226fbc95a124aac569f4
parent1f67c0b83ec4a52d885f6e4fceea2627c14532e4
Merge branch 'MDL-52786-master' of git://github.com/jleyva/moodle

Conflicts:
lib/db/services.php
mod/quiz/db/services.php