Merge branch 'MDL-38935' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 10 Apr 2013 03:17:31 +0000 (11:17 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 10 Apr 2013 03:17:31 +0000 (11:17 +0800)

Trivial merge