Merge branch 'MDL-40392' of git://github.com/stronk7/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 9 Jul 2013 13:51:41 +0000 (21:51 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 9 Jul 2013 13:51:41 +0000 (21:51 +0800)

Trivial merge