Merge branch 'MDL-49933-master' of git://github.com/lucisgit/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 22 Apr 2015 09:02:19 +0000 (17:02 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 22 Apr 2015 09:02:19 +0000 (17:02 +0800)

Trivial merge