Merge branch 'wip-MDL-30316-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:46:44 +0000 (12:46 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:46:44 +0000 (12:46 +0800)

Trivial merge