Merge branch 'MDL-35078-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 6 Jan 2015 02:35:04 +0000 (10:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 6 Jan 2015 02:35:04 +0000 (10:35 +0800)

Trivial merge