Merge branch 'MDL-34102' of git://github.com/jmvedrine/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 12 May 2015 04:08:30 +0000 (12:08 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 12 May 2015 04:08:30 +0000 (12:08 +0800)

Trivial merge