Merge branch 'MDL-34471-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 8 Aug 2012 03:05:39 +0000 (15:05 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 8 Aug 2012 03:05:39 +0000 (15:05 +1200)
1  2 
message/lib.php
mod/forum/lib.php
mod/forum/post.php

diff --cc message/lib.php
Simple merge
Simple merge
Simple merge