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

Trivial merge