Merge branch 'MDL-56019-master' of git://github.com/dpalou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 18:08:31 +0000 (20:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 18:08:31 +0000 (20:08 +0200)
1  2 
mod/forum/externallib.php
mod/wiki/classes/external.php

Simple merge
Simple merge