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)
commit04e49ead57193c9b18f3ed17cf7dcc20fc6ec421
tree840d1995e7a4b9db30cbf47667e29f53965e5d31
parentf71011e825a92b501b0e7c618fedf84b5dfaed8e
parentc169e580486796897a1e13aed5ae5edc9dc23ec3
Merge branch 'w42_MDL-42243_m26_filtersettings' of https://github.com/skodak/moodle