Merge branch 'MDL-50428-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 29 Dec 2015 02:46:52 +0000 (10:46 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 29 Dec 2015 02:46:52 +0000 (10:46 +0800)
commit97f4eb11a5d1d8400925ddd6616eaa2096dc6bee
tree4e63788bcf0b317abf13583eb3b52636dcd542e6
parent9787b9e02f7c735a895da63a0a8ee54979e4626f
parent98fff78d000f27f16fdc40e74b41ae0a9802cf00
Merge branch 'MDL-50428-master' of git://github.com/jleyva/moodle

Conflicts:
mod/scorm/version.php
version.php
lib/db/services.php
mod/scorm/classes/external.php
mod/scorm/locallib.php
mod/scorm/tests/externallib_test.php
mod/scorm/version.php
version.php