Merge branch 'wip-MDL-35608-master' of git://github.com/phalacee/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 9 Apr 2013 05:59:45 +0000 (13:59 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 9 Apr 2013 05:59:45 +0000 (13:59 +0800)

Trivial merge