Merge branch 'MDL-49107-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 03:42:58 +0000 (11:42 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 03:42:58 +0000 (11:42 +0800)

Trivial merge