Merge branch 'wip-MDL-34527-m23' of git://github.com/samhemelryk/moodle into MOODLE_2...
authorDan Poltawski <dan@moodle.com>
Mon, 5 Nov 2012 05:25:18 +0000 (13:25 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Nov 2012 05:25:18 +0000 (13:25 +0800)

Trivial merge