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

Trivial merge