Merge branch 'MDL-40524' of git://github.com/aolley/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 16 Jul 2013 03:24:06 +0000 (11:24 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 16 Jul 2013 03:24:06 +0000 (11:24 +0800)

Trivial merge