Merge branch 'MDL-36009-master' of git://github.com/jethac/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 9 Feb 2015 08:58:57 +0000 (16:58 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 9 Feb 2015 08:58:57 +0000 (16:58 +0800)

Trivial merge