Merge branch 'MDL-50911_master' of git://github.com/StudiUM/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 03:58:28 +0000 (11:58 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 03:58:28 +0000 (11:58 +0800)

Trivial merge