Merge branch 'MDL-33560-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Jul 2012 00:25:20 +0000 (12:25 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Jul 2012 00:25:20 +0000 (12:25 +1200)
commit6fcebf2424df5169828d45d9f202ca6cc61d402f
tree09ba00f45459f30b6fff5d270330aa76a41e2ad9
parent9d1594b04bf9f6e7ac497cad07d0afd9888514c9
parent23371805ea877ee564329b9aae4bd279b0b993b7
Merge branch 'MDL-33560-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE