Merge branch 'MDL-49281-master' of git://github.com/mastnym/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 30 Apr 2015 06:53:52 +0000 (14:53 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 30 Apr 2015 06:53:52 +0000 (14:53 +0800)

Trivial merge