Merge branch 'wip-MDL-41967-master' of git://github.com/abgreeve/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 9 Oct 2013 04:46:14 +0000 (12:46 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 9 Oct 2013 04:46:14 +0000 (12:46 +0800)

Trivial merge