Merge branch 'wip-MDL-37290-m23' of git://github.com/samhemelryk/moodle into MOODLE_2...
authorDan Poltawski <dan@moodle.com>
Mon, 24 Dec 2012 02:55:37 +0000 (10:55 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Dec 2012 02:55:37 +0000 (10:55 +0800)

Trivial merge