Merge branch 'MDL-42808-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 18 Nov 2013 07:26:52 +0000 (15:26 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 18 Nov 2013 07:26:52 +0000 (15:26 +0800)

Trivial merge