Merge branch 'wip-MDL-31738-MOODLE_21_STABLE' of git://github.com/marinaglancy/moodle...
commit05bfd9ff6fd8545098a69fe78bb69aa89db1c9e6
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Feb 2012 23:30:49 +0000 (29 00:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Feb 2012 23:30:49 +0000 (29 00:30 +0100)
treebb091d2de525a0cc6213bfaec9f95619f4a05c49
parented27a82dbcd05a50f8832130a3ef033b6ca89b9c
parentc73d54850feaa46540c9434fc37bd73991fe421e
Merge branch 'wip-MDL-31738-MOODLE_21_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_21_STABLE