Merge branch 'MDL-38440-master' of git://github.com/mouneyrac/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 29 Apr 2013 03:01:57 +0000 (11:01 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 29 Apr 2013 03:01:57 +0000 (11:01 +0800)

Trivial merge