Merge branch 'MDL-49444-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 24 Mar 2015 09:43:29 +0000 (17:43 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 24 Mar 2015 09:43:29 +0000 (17:43 +0800)

Trivial merge