Merge branch 'MDL-43632-master' of https://github.com/lucisgit/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 20 Jan 2014 09:10:38 +0000 (17:10 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 20 Jan 2014 09:10:38 +0000 (17:10 +0800)

Trivial merge