Merge branch 'MDL-47183-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 28 Oct 2014 01:02:19 +0000 (14:02 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 28 Oct 2014 01:02:19 +0000 (14:02 +1300)
1  2 
course/renderer.php
mod/forum/post.php

Simple merge
Simple merge