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

Trivial merge