Merge branch 'MDL-52809-master' of git://github.com/dpalou/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Mar 2016 04:23:54 +0000 (12:23 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Mar 2016 04:23:54 +0000 (12:23 +0800)
commitfd8e293030ef1ba1eabe30d51037690fdf35e957
treedb24451b4721c57c2267e3e4122713a2a7c6dd6f
parent64d6465650743c2646b5f08c9c09fdd366a1b58d
parent5380c664d493f29b59cf70011e8b2bf51b8e7424
Merge branch 'MDL-52809-master' of git://github.com/dpalou/moodle
lib/db/services.php
version.php