Merge branch 'MDL-36137_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Oct 2012 23:16:50 +0000 (12:16 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Oct 2012 23:16:50 +0000 (12:16 +1300)
commitb9697365a1c25d0260eae86a2a5c4af0af4a4954
treee2cc5c47da8be811406af974453665504fb11bec
parent6b0ada1e6eaa2b197a37a44d4ae48be80a0649c0
parentcd2ae155de61a4e477dadfba418fdc019a4f9e86
Merge branch 'MDL-36137_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE