Merge branch 'MDL-50783-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Sep 2015 07:52:42 +0000 (15:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Sep 2015 07:52:42 +0000 (15:52 +0800)
1  2 
lib/db/services.php
lib/externallib.php
lib/upgrade.txt

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