Merge branch 'wip-MDL-39888-master-v2' of git://github.com/abgreeve/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 27 Aug 2014 01:53:35 +0000 (09:53 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 27 Aug 2014 01:53:35 +0000 (09:53 +0800)

Trivial merge