Merge branch 'wip-MDL-35823-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 6 Feb 2013 05:42:47 +0000 (13:42 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 6 Feb 2013 05:42:47 +0000 (13:42 +0800)

Trivial merge