Merge branch 'm29_MDL-48567' of git://github.com/totara/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 16 Dec 2014 05:33:54 +0000 (13:33 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 16 Dec 2014 05:33:54 +0000 (13:33 +0800)

Trivial merge