Merge branch 'MDL-52924-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 01:25:19 +0000 (09:25 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 01:25:19 +0000 (09:25 +0800)
commitb756bd551a08543e40b0db8b2bda43b0c37cc505
treec4572d2a8b059dfddde1b61ee68bc562f3d0d45c
parent52c6e158e04c04fbc8f69271755583a74bc73d46
parentbdf1ac279651e30611e75adddb39c4c2627c2e26
Merge branch 'MDL-52924-master' of git://github.com/jleyva/moodle

Conflicts:
version.php
mod/assign/externallib.php
mod/assign/tests/externallib_test.php
version.php