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)
commit363cb2df7ea8f407604edf8752ce6559a2c0a81d
treec42b71d8304a039d46a4483517c6383438d54171
parent951f9829c0a2b0a1da0e4d50c0b5b7c647cd662c
parent4371b301f2a4c3caca3c3598795932022125618c
Merge branch 'w24_MDL-33768_m23_filters' of git://github.com/skodak/moodle