Merge branch 'MDL-38705' of git://github.com/jonof/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 3 Apr 2013 06:35:12 +0000 (14:35 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 3 Apr 2013 06:35:12 +0000 (14:35 +0800)

Trivial merge