Merge branch 'wip-MDL-36206-master' of git://github.com/phalacee/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 5 Feb 2013 06:11:07 +0000 (14:11 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 5 Feb 2013 06:11:07 +0000 (14:11 +0800)

Trivial merge