Merge branch 'MDL-35547_22' of git://github.com/enovation/moodle into MOODLE_22_STABLE
commit7697512a90cf00c13581965d970057cfab2956a2
authorSam Hemelryk <sam@moodle.com>
Mon, 1 Oct 2012 21:15:19 +0000 (2 10:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 1 Oct 2012 21:15:19 +0000 (2 10:15 +1300)
tree664f2b17b495d310f1ea2cec0a50afea2d060ffb
parent1950fefc9987211deb9eb62c9f6083efa1546a45
parent237897b9681e1d0a24b9a43837f92f479c08e659
Merge branch 'MDL-35547_22' of git://github.com/enovation/moodle into MOODLE_22_STABLE