Merge branch 'MDL-38633' of git://github.com/stronk7/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 4 Apr 2013 06:26:15 +0000 (14:26 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 4 Apr 2013 06:26:15 +0000 (14:26 +0800)

Trivial merge