Merge branch 'wip-MDL-46921-master' of git://github.com/abgreeve/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 9 Oct 2014 01:57:58 +0000 (09:57 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 9 Oct 2014 01:57:58 +0000 (09:57 +0800)

Trivial merge