Merge branch 'MDL-42065_master' of https://github.com/sam-moodle/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 16 Oct 2013 07:45:40 +0000 (15:45 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 16 Oct 2013 07:45:40 +0000 (15:45 +0800)

Trivial merge