Merge branch 'MDL-40499' of git://github.com/jmvedrine/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 9 Jul 2013 05:26:49 +0000 (13:26 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 9 Jul 2013 05:26:49 +0000 (13:26 +0800)

Trivial merge