Merge branch 'MDL-30940-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 29 Apr 2013 06:03:34 +0000 (14:03 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 29 Apr 2013 06:03:34 +0000 (14:03 +0800)

Trivial merge