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

Trivial merge