Merge branch 'MDL-52073-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 22 Dec 2015 08:23:33 +0000 (16:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 22 Dec 2015 08:23:33 +0000 (16:23 +0800)
commita96bf448b86965902def1d165a39390ca470adb1
treedc7b98e0d2540067a441116d2c97908c91a639f5
parent64f4889ad1d2a1a70eee308db0bcbb35e058036d
parent1e5241a12b1800d9dc1592f63dde4c20fdc86f5d
Merge branch 'MDL-52073-master' of git://github.com/jleyva/moodle

Conflicts:
version.php
lib/db/services.php
version.php