Merge branch 'MOODLE_21_STABLE' of git.moodle.org:/git/integration into MOODLE_21_STABLE
commit3bdb9bfd54a7ed9889ece3eb72ba344e11bd9e5c
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Aug 2011 00:41:27 +0000 (29 02:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Aug 2011 00:41:27 +0000 (29 02:41 +0200)
treea83c654bf26f7fb0080797de4a05c6e1aea38254
parent1dd41f0eb140fcefaf5cf55b111035089ed1f8e7
parent78b19caf0aabc2ba2cad23d715d65858dbd3972e
Merge branch 'MOODLE_21_STABLE' of git.moodle.org:/git/integration into MOODLE_21_STABLE