Merge branch 'MDL-55220-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jul 2016 11:21:36 +0000 (13:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jul 2016 11:21:36 +0000 (13:21 +0200)
1  2 
mod/forum/externallib.php

Simple merge