Merge branch 'MDL-54941-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 22:29:45 +0000 (00:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 22:29:45 +0000 (00:29 +0200)
1  2 
mod/wiki/classes/external.php

Simple merge