Merge branch 'MDL-33984_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE
commit68b0cae5bc0490d3de67ed289f293f3928bc2a4c
authorDan Poltawski <dan@moodle.com>
Mon, 25 Jun 2012 13:57:08 +0000 (25 21:57 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Jun 2012 13:57:08 +0000 (25 21:57 +0800)
treead8a0ce3302fc8e4454861b1cb3925514b87b695
parente9a8da9d76e2b6f94c0c9966010a474870be3068
parent72988ea0f48cfeae0eb37effcced7abcc2f9ec4b
Merge branch 'MDL-33984_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE