Merge branch 'MDL-50966-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 08:58:54 +0000 (16:58 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 08:58:54 +0000 (16:58 +0800)
1  2 
lib/db/services.php

Simple merge