Merge branch 'wip-MDL-35823-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 03:23:41 +0000 (11:23 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 03:23:41 +0000 (11:23 +0800)

Trivial merge