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

Simple merge
Simple merge