Merge branch 'wip-MDL-33661-master' of https://github.com/barbararamiro/moodle
[moodle.git] / filter / emoticon / filter.php
2012-05-20 Eloy Lafuente (str... Subtree merged git://github.com/skodak/moodle-mod_book...
2010-10-23 David MudrakMDL-24777 replace_smilies() replaced with the new stand...