Merge branch 'MDL-33125_23' of git://github.com/aolley/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Dec 2012 21:19:22 +0000 (10:19 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Dec 2012 21:19:22 +0000 (10:19 +1300)
commitcf0451133fa4f668e763e5909747ac82a761c279
tree3e32a2ace6bee73b0291ef741270014b641b6bfd
parent5fa7d720643ea24e4b446601d0366f33bdc09bb4
parent69b0d174367736446079f0d65618ca11557ea8c9
Merge branch 'MDL-33125_23' of git://github.com/aolley/moodle into MOODLE_23_STABLE