Merge branch 'MDL-33424' of git://github.com/jmvedrine/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 11 Mar 2013 05:30:45 +0000 (13:30 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 11 Mar 2013 05:30:45 +0000 (13:30 +0800)

Trivial merge