Merge branch 'wip-mdl-41339' of https://github.com/jennymgray/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 23 Oct 2013 03:50:50 +0000 (11:50 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 23 Oct 2013 03:50:50 +0000 (11:50 +0800)

Trivial merge