Merge branch 'wip-MDL-34798_M23-2' of git://github.com/gjb2048/moodle into MOODLE_23_...
authorDan Poltawski <dan@moodle.com>
Tue, 12 Feb 2013 02:34:23 +0000 (10:34 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Feb 2013 02:34:23 +0000 (10:34 +0800)

Trivial merge