Merge branch 'MDL-38498-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 20 May 2013 08:11:59 +0000 (16:11 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 20 May 2013 08:11:59 +0000 (16:11 +0800)

Trivial merge