Merge branch 'MDL-34164_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 16 Jul 2012 02:05:51 +0000 (10:05 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Jul 2012 02:05:51 +0000 (10:05 +0800)
commit8242298e4b962d3d92776a6c96d0f41353a62ccb
treef4c7bae41790229456291a651c4f0c0b6bc28ffc
parentae8e49e8de59d9bf8234a9aa144dc6b2ea666054
parent04de7affb6f43aaea6f14e1d25ed9872860bb430
Merge branch 'MDL-34164_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE