Merge branch 'MDL-28979_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commitb61fd419e855940259e50cfd0c9f93b825a098e0
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 23:56:06 +0000 (24 01:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 23:56:06 +0000 (24 01:56 +0200)
tree0ba57c357768ec43ef1ec47f228085488c10673d
parent8c412f122cc6acd0965c99190c0c16400554ccb4
parent96bab3e01d541bf57f3103dc8acd8ddf0a0cceb2
Merge branch 'MDL-28979_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE