Merge branch 'MDL-47529-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Feb 2015 03:52:50 +0000 (11:52 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Feb 2015 03:52:50 +0000 (11:52 +0800)

Trivial merge