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)
13 files changed:
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge