Merge branch 'MDL-49849-master' of git://github.com/gurgus/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 22 Apr 2015 06:40:37 +0000 (14:40 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 22 Apr 2015 06:40:37 +0000 (14:40 +0800)

Trivial merge