Merge branch 'MDL-55112-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Jul 2016 13:42:06 +0000 (14:42 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Jul 2016 13:42:06 +0000 (14:42 +0100)
1  2 
mod/forum/externallib.php

Simple merge