Merge branch 'MDL-57629-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jan 2017 19:55:05 +0000 (20:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jan 2017 19:55:05 +0000 (20:55 +0100)
1  2 
course/externallib.php
mod/forum/externallib.php

Simple merge
Simple merge