Merge branch 'MDL-51886-master' of git://github.com/dpalou/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 22 Dec 2015 08:28:18 +0000 (16:28 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 22 Dec 2015 08:28:18 +0000 (16:28 +0800)
commitfebc3148956100d8996f2b5eceb233e9d4c8c4ed
treea4695cee224ccd1a51b183308c63d7d6a6c7c1bb
parenta96bf448b86965902def1d165a39390ca470adb1
parentc1baf89e5734e3575cf501505798834eb5b01e91
Merge branch 'MDL-51886-master' of git://github.com/dpalou/moodle

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