Merge branch 'MDL-50493-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Aug 2015 03:46:14 +0000 (11:46 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Aug 2015 03:46:14 +0000 (11:46 +0800)
1  2 
mod/forum/externallib.php
mod/forum/tests/externallib_test.php

Simple merge
Simple merge