Merge branch 'MDL-29938-master' of git://github.com/mouneyrac/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 19 Feb 2013 02:10:48 +0000 (10:10 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 19 Feb 2013 02:10:48 +0000 (10:10 +0800)

Trivial merge