Merge branch 'MDL-50110' of git://github.com/ramdesh/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 7 May 2015 04:16:03 +0000 (12:16 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 May 2015 04:16:03 +0000 (12:16 +0800)

Trivial merge