Merge branch 'm21_MDL-28110' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE
commit14cf05a2cf06986d9c70edaf61f9a802aa5555b1
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jul 2011 01:01:30 +0000 (7 03:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jul 2011 01:01:30 +0000 (7 03:01 +0200)
treecd0be86036307409e377ea8d5bca95188850be8f
parentacfa08a69f1ef79fa4eb7ec432223f06ac333a59
parente1a1827b59a15d5c3324eb81407984290e4b8b2d
Merge branch 'm21_MDL-28110' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE