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

Trivial merge