Merge branch 'wip-MDL-41231-master' of git://github.com/abgreeve/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 2 Sep 2013 07:26:26 +0000 (15:26 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 2 Sep 2013 07:26:26 +0000 (15:26 +0800)

Trivial merge