Merge branch 'w42_MDL-42243_m26_filtersettings' of https://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Oct 2013 21:19:18 +0000 (23:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Oct 2013 21:19:18 +0000 (23:19 +0200)

Trivial merge