Merge branch 'MDL-42122' of git://github.com/aolley/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 8 Oct 2013 04:48:10 +0000 (12:48 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 8 Oct 2013 04:48:10 +0000 (12:48 +0800)

Trivial merge