Merge branch 'wip-MDL-36108-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 08:03:09 +0000 (16:03 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 08:03:09 +0000 (16:03 +0800)

Trivial merge