Merge branch 'MDL-36076_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit0be66059a24915f055071be2d22ac6a92b23cc52
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Oct 2012 23:59:02 +0000 (30 12:59 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Oct 2012 23:59:02 +0000 (30 12:59 +1300)
treed31900e88694728d1803209704e4df067ee79e92
parent6dc38156a257a056edf2650f8478aaf431a7dd03
parent91a307c91878d35a07af6cca84dff9ba174d60ab
Merge branch 'MDL-36076_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE