Merge branch '44157-27' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Feb 2014 23:51:33 +0000 (00:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Feb 2014 23:51:33 +0000 (00:51 +0100)
commit6a586f0036479d6963100b32cd0847f33fa5f70f
treeebb5b2d378a99eb62c9fcf77e9819f7b3e531e32
parent0807908f17296b44d0b16fe9e31ff59230bd90e0
parent01030f1be65a45710be2d7fb2823dd026e1c08b6
Merge branch '44157-27' of git://github.com/samhemelryk/moodle
13 files changed:
mod/forum/discuss.php
mod/forum/index.php
mod/forum/lang/en/forum.php
mod/forum/lib.php
mod/forum/markposts.php
mod/forum/post.php
mod/forum/search.php
mod/forum/settracking.php
mod/forum/subscribe.php
mod/forum/subscribers.php
mod/forum/user.php
mod/forum/version.php
mod/forum/view.php