Merge branch 'wip_MDL-43918_m28_cm' of https://github.com/skodak/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 25 Aug 2014 08:45:15 +0000 (16:45 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 25 Aug 2014 08:45:15 +0000 (16:45 +0800)

Trivial merge