Merge branch 'MDL-54026-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 May 2016 03:52:02 +0000 (11:52 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 May 2016 03:52:02 +0000 (11:52 +0800)
1  2 
lib/db/services.php

Simple merge