Merge branch 'MDL-48765-master' of git://github.com/mackensen/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 20 Jan 2015 09:08:21 +0000 (17:08 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 20 Jan 2015 09:08:21 +0000 (17:08 +0800)

Trivial merge