Merge branch 'MDL-46986-master' of https://github.com/lameze/moodle
authorDamyon Wiese <damyon@moodle.com>
Fri, 7 Nov 2014 08:08:20 +0000 (16:08 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 7 Nov 2014 08:08:20 +0000 (16:08 +0800)

Trivial merge