Merge branch 'w24_MDL-33768_m23_filters' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 15 Jun 2012 10:07:59 +0000 (12:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 15 Jun 2012 10:07:59 +0000 (12:07 +0200)

Trivial merge