Merge branch 'MDL-48015-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 17 Feb 2016 01:49:04 +0000 (09:49 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 17 Feb 2016 01:49:04 +0000 (09:49 +0800)

Trivial merge