Merge branch 'MDL-52785-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 9 Mar 2016 07:16:48 +0000 (15:16 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 9 Mar 2016 07:16:48 +0000 (15:16 +0800)
commit20097a057d3d7df4337d3614773607c11a58a558
tree7319c1f7660d472bbec80cf33fd6375490e9d8be
parent5ca1a776498078c357ded2a4399a274c6eed805d
parente73e458170b96a740cf54a37ee975e820188107f
Merge branch 'MDL-52785-master' of git://github.com/jleyva/moodle

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