Merge branch 'MDL-25232' of git://git.luns.net.uk/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 10 Jan 2011 13:35:38 +0000 (14:35 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 10 Jan 2011 13:35:38 +0000 (14:35 +0100)
1  2 
mod/forum/lib.php

Simple merge