Merge branch 'wip-MDL-32018-m22' of git://github.com/samhemelryk/moodle into MOODLE_2...
commit8c6bc1e000ab347593290b6776ef61e0cab25ced
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2012 19:06:16 +0000 (3 21:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2012 19:06:16 +0000 (3 21:06 +0200)
treee67b18ee9425ed0b0bc627881b2960187a2d95a8
parentd0f6d6172a1f087d7d987421f25c4828d01dbaad
parent4b023f2a1021763cb34fc12a19a7148ab3dfe5dc
Merge branch 'wip-MDL-32018-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE