Merge branch 'MDL-51324-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 9 Mar 2016 06:20:18 +0000 (14:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 9 Mar 2016 06:20:18 +0000 (14:20 +0800)
1  2 
lib/db/services.php
lib/upgrade.txt

Simple merge
diff --cc lib/upgrade.txt
Simple merge