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)
commit35f667d8501fd497752dbbffe751b8b0a25a1605
tree431512add15089652e374897d915cf11b6d4bdf4
parentf81a08b4910d458aef8379af6b047858d5becd82
parentd26cc0a0226b7f13bef6de1ae38ce55198de7275
Merge branch 'wip-MDL-34798_M23-2' of git://github.com/gjb2048/moodle into MOODLE_23_STABLE