Merge branch 'MDL-51213-master' of git://github.com/damyon/moodle
commit3bc0824e46f56b6b5bfeee0ae525a7aeb3058a1b
authorDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 09:28:34 +0000 (15 17:28 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 09:28:34 +0000 (15 17:28 +0800)
treef7f74cb1196c049019be463142404138dfa9bb32
parentb3e8e09175167a5376ffbf90df456dda1f058f2e
parent08bda175de2bb76cd14dbc70bd7589e632ed67ef
Merge branch 'MDL-51213-master' of git://github.com/damyon/moodle
lib/externallib.php
lib/weblib.php