Merge branch 'MDL-48679-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Feb 2015 09:45:22 +0000 (17:45 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Feb 2015 09:45:22 +0000 (17:45 +0800)

Trivial merge