Merge branch 'm29_MDL-48805' of git://github.com/totara/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Feb 2015 07:26:49 +0000 (15:26 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Feb 2015 07:26:49 +0000 (15:26 +0800)

Trivial merge