Merge branch 'MDL-49870-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 6 May 2015 07:30:31 +0000 (15:30 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 6 May 2015 07:30:31 +0000 (15:30 +0800)

Trivial merge