Merge branch 'm29_MDL-49904' of git://github.com/totara/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 20 Apr 2015 02:40:37 +0000 (10:40 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 20 Apr 2015 02:40:37 +0000 (10:40 +0800)

Trivial merge