Merge branch 'MDL-49921-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 22 Apr 2015 15:40:15 +0000 (16:40 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 22 Apr 2015 15:40:15 +0000 (16:40 +0100)
1  2 
mod/forum/externallib.php

Simple merge