Merge branch 'MDL-51296-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 14 Sep 2015 05:16:52 +0000 (13:16 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 14 Sep 2015 05:16:52 +0000 (13:16 +0800)

Trivial merge