Merge branch 'wip-MDL-39710-m24' of git://github.com/marinaglancy/moodle into MOODLE_...
commit813db77aa23c383bd045db56ff7e8a266a2efeeb
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Jun 2013 21:22:44 +0000 (3 23:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Jun 2013 21:22:44 +0000 (3 23:22 +0200)
tree93e5cecb7767d300085a25db8690ef968acd81d3
parente4c30d9639d0d3a4d4560a60574fc064cfe4ad2d
parent8069eac74bde93ee6dd40fa8c59569e4add466ad
Merge branch 'wip-MDL-39710-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE