Merge branch 'wip-MDL-31810-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 04:01:20 +0000 (12:01 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 04:01:20 +0000 (12:01 +0800)

Trivial merge