Merge branch '44157-27' of git://github.com/samhemelryk/moodle

diff --cc mod/forum/discuss.php
Simple merge

diff --cc mod/forum/index.php
Simple merge

diff --cc mod/forum/lang/en/forum.php
Simple merge

diff --cc mod/forum/lib.php
Simple merge

diff --cc mod/forum/markposts.php
Simple merge

diff --cc mod/forum/post.php
Simple merge

diff --cc mod/forum/search.php
Simple merge

diff --cc mod/forum/settracking.php
Simple merge

diff --cc mod/forum/subscribe.php
Simple merge

diff --cc mod/forum/subscribers.php
Simple merge

diff --cc mod/forum/user.php
Simple merge

diff --cc mod/forum/version.php
Simple merge

diff --cc mod/forum/view.php
Simple merge