Merge branch 'MDL-50947_master' of git://github.com/moodlerooms/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 12 Aug 2015 00:30:03 +0000 (08:30 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 12 Aug 2015 00:30:03 +0000 (08:30 +0800)

Trivial merge