Merge branch 'MDL-52670-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 9 Mar 2016 07:10:54 +0000 (15:10 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 9 Mar 2016 07:10:54 +0000 (15:10 +0800)
commit9b701a37e4e4365855f89866c7233329b932f20b
treef014e8b86772760546444838ebed9026ae9e1747
parent11bad2b09935fbba37e53826b8fa67adb24dced6
parentc161ecff889bc3e431bf79ad7d45115c9c3e558c
Merge branch 'MDL-52670-master' of git://github.com/jleyva/moodle

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