Merge branch 'MDL-49650-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 10 Apr 2015 07:52:38 +0000 (15:52 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 10 Apr 2015 07:52:38 +0000 (15:52 +0800)

Trivial merge