Merge branch 'MDL-49333-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 08:23:17 +0000 (16:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 08:23:17 +0000 (16:23 +0800)

Trivial merge