Merge branch 'MDL-41071-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 08:01:12 +0000 (16:01 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 08:01:12 +0000 (16:01 +0800)

Trivial merge