Merge branch 'w48_MDL-30487_m22_filtertest' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 28 Nov 2011 19:18:43 +0000 (20:18 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 28 Nov 2011 19:18:43 +0000 (20:18 +0100)
commit3654f38623d03bab92c80f03fcf909fc4fed14c1
tree1e0a658a9a1f6c8384bfb96b015040e5400d127f
parent66b97716c54350c3d7be04b96df4d7b7806f5522
parente7b90ca0faa76a8e7c2e60b76fbc9131d6cbedd7
Merge branch 'w48_MDL-30487_m22_filtertest' of git://github.com/skodak/moodle