Merge branch 'MDL-51250-master-3' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 7 Oct 2015 03:15:26 +0000 (11:15 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 7 Oct 2015 03:15:26 +0000 (11:15 +0800)

Trivial merge