Merge branch 'MDL-15377-master' of git://github.com/raymanuk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Sep 2011 01:42:28 +0000 (13:42 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Sep 2011 01:42:28 +0000 (13:42 +1200)
1  2 
lib/filterlib.php

Simple merge