Merge branch 'MDL-41767-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 01:57:15 +0000 (09:57 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 01:57:15 +0000 (09:57 +0800)

Trivial merge