Merge branch 'MDL-49823-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Oct 2015 23:08:52 +0000 (01:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Oct 2015 23:08:52 +0000 (01:08 +0200)
1  2 
message/externallib.php
mod/choice/classes/external.php
mod/forum/lib.php

Simple merge
Simple merge
Simple merge