Merge branch 'MDL-48841-master' of git://github.com/lucisgit/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 06:23:22 +0000 (14:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 06:23:22 +0000 (14:23 +0800)

Trivial merge