Merge branch 'wip-MDL-34404-m23' of git://github.com/samhemelryk/moodle into MOODLE_2...
authorDan Poltawski <dan@moodle.com>
Mon, 23 Jul 2012 05:26:12 +0000 (13:26 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Jul 2012 05:26:12 +0000 (13:26 +0800)

Trivial merge