Merge branch 'MDL-38340-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 18 Mar 2013 05:24:45 +0000 (13:24 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 18 Mar 2013 05:24:45 +0000 (13:24 +0800)

Trivial merge