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)
1  2 
course/lib.php
lib/filterlib.php

diff --cc course/lib.php
Simple merge
Simple merge