Merge branch 'MDL-29236-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2011 18:37:24 +0000 (20:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2011 18:37:24 +0000 (20:37 +0200)
commitce9d0673d0ea709f3fc1ea7eb4425777c8d1fb32
tree392cbad2023e9de578cd3086fd5dc421f2412987
parentf8fa11e1afc685d9d8ce403a1aa9a406af496c65
parent371fbe1cc1a49b933570958edb90e02dba801130
Merge branch 'MDL-29236-master' of git://github.com/sammarshallou/moodle
course/lib.php
lib/filterlib.php