Merge branch 'wip-MDL-21097-m24' of git://github.com/marinaglancy/moodle into MOODLE_...
commit520f2926996a5066580c08a7c96c030e32fff7ea
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jun 2013 08:36:31 +0000 (5 10:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jun 2013 08:36:31 +0000 (5 10:36 +0200)
tree8e1b56d1314bec842a15a8d3540de02a50591f6a
parent64a21db7668caf527d2a6ce6939d120cd5edea7f
parent82f43805fe08fd023259b3650e0fe1d6d5c507bb
Merge branch 'wip-MDL-21097-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE