Merge branch 'wip-MDL-30072-master' of git://github.com/phalacee/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 25 Feb 2013 04:37:56 +0000 (12:37 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 25 Feb 2013 04:37:56 +0000 (12:37 +0800)

Trivial merge