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

Trivial merge