Merge branch 'MDL-37775_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE
commit52c86533d9da5bb70a2f90c1d926f10810b1bed7
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Feb 2013 23:57:33 +0000 (5 00:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Feb 2013 23:57:33 +0000 (5 00:57 +0100)
tree23861329bb3baf41e5068a0ba17db380603c538e
parent47ae7ebe35fc8d0b57ac5b5d41fe3a4375495ca5
parent56364dcec011fe91f44332baa5fa7723e973931e
Merge branch 'MDL-37775_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE