Merge branch 'wip-MDL-30797-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Jan 2013 07:26:09 +0000 (15:26 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Jan 2013 07:26:09 +0000 (15:26 +0800)

Trivial merge