Merge branch 'w04_MDL-31081_m23_forumindex' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jan 2012 20:17:54 +0000 (21:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jan 2012 20:17:54 +0000 (21:17 +0100)
1  2 
mod/forum/lib.php

Simple merge