Merge branch 'w33_MDL-28708_m21_f304' of git://github.com/skodak/moodle into MOODLE_2...
commit4ffedd8b0eb86c2ac2bfd3cf577db81b29e36900
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 21:32:36 +0000 (23 23:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 21:32:36 +0000 (23 23:32 +0200)
tree2b96db2a177c441ae19a6d061770a25357a0a405
parent71cf843ad2b8d172ea3488884bafc3bab7142574
parent68d9daa1876680e03571554423f61ff721aa69e9
Merge branch 'w33_MDL-28708_m21_f304' of git://github.com/skodak/moodle into MOODLE_21_STABLE