Merge branch 'wip-MDL-38147-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 27 Mar 2013 06:11:27 +0000 (14:11 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 27 Mar 2013 06:11:27 +0000 (14:11 +0800)

Trivial merge