Merge branch 'MDL-31345_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE
commit896f9739ccdb36085d13e7fe39a95f7426fbab58
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Feb 2012 14:40:16 +0000 (20 15:40 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Feb 2012 14:40:16 +0000 (20 15:40 +0100)
tree8cc596f503244493f9da4acac849f3703819819b
parent50a1fe7b13a681d3d6e449e25628154636c9f334
parent1b80c4a8ec34d2a5bc67d62f6416d3c5f7123da7
Merge branch 'MDL-31345_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE