Merge branch 'MDL-47084-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 8 Oct 2014 13:43:13 +0000 (14:43 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 8 Oct 2014 13:43:13 +0000 (14:43 +0100)
1  2 
lib/weblib.php
mod/forum/externallib.php
mod/forum/tests/externallib_test.php

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