Merge branch 'MDL-49114-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 31 Mar 2015 03:29:16 +0000 (11:29 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 31 Mar 2015 03:29:16 +0000 (11:29 +0800)

Trivial merge