Merge branch 'MDL-41688-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 21 Jan 2014 01:35:21 +0000 (09:35 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 21 Jan 2014 01:35:21 +0000 (09:35 +0800)

Trivial merge