Merge branch 'MDL-50109-master-blogsort' of https://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Sep 2015 09:44:47 +0000 (10:44 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Sep 2015 09:44:47 +0000 (10:44 +0100)
1  2 
mod/forum/lib.php
mod/forum/tests/lib_test.php

Simple merge
Simple merge