Merge branch 'MDL-40455_M26' of git://github.com/lazydaisy/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 9 Jul 2013 07:20:07 +0000 (15:20 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 9 Jul 2013 07:20:07 +0000 (15:20 +0800)

Trivial merge