Merge branch 'wip-MDL-38145-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 25 Feb 2013 07:42:13 +0000 (15:42 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 25 Feb 2013 07:42:13 +0000 (15:42 +0800)

Trivial merge