Merge branch 'MDL-29548_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit85dd2a674ac0b18b05a6c0930a5fbf21c1d5fa9a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2011 10:37:45 +0000 (4 12:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2011 10:37:45 +0000 (4 12:37 +0200)
tree7c5108743cd2004b5aca3fe936d2904ae3a42a01
parentfdca6e83218762456c2b085c34231d0bd3052c83
parentfa8843c424f8a1fd9c1511b178593bac580ff920
Merge branch 'MDL-29548_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE