Merge branch 'wip-MDL-41081-m26' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 06:11:03 +0000 (14:11 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 06:11:03 +0000 (14:11 +0800)

Trivial merge