Merge branch 'wip-MDL-35979-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Dec 2012 03:48:32 +0000 (11:48 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Dec 2012 03:48:32 +0000 (11:48 +0800)

Trivial merge