Merge branch 'MDL-52669-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Mar 2016 06:56:58 +0000 (14:56 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Mar 2016 06:56:58 +0000 (14:56 +0800)
1  2 
lib/db/services.php
mod/quiz/classes/external.php

Simple merge
Simple merge