Merge branch 'MDL-51415-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 30 Sep 2015 06:15:29 +0000 (14:15 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 30 Sep 2015 06:15:29 +0000 (14:15 +0800)
1  2 
user/externallib.php

Simple merge