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)
commit342e97ee9c23e632b78223a9ee6a26463d47c200
treed8929a32fb2d9e0793c1d4b2dafd82e0c81b4729
parent0eac94dfc7991ff2fa2c84d8d04d735f906fbe24
parent34d37f751444dabcfcb14ced7d06a8f05626f99a
Merge branch 'MDL-15377-master' of git://github.com/raymanuk/moodle
lib/filterlib.php