Merge branch 'MDL-38474-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Fri, 15 Mar 2013 05:49:57 +0000 (13:49 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 15 Mar 2013 05:49:57 +0000 (13:49 +0800)

Trivial merge