Merge branch 'wip-MDL-37028-fix2' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 11 Sep 2013 08:55:13 +0000 (16:55 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 11 Sep 2013 08:55:13 +0000 (16:55 +0800)

Trivial merge