Merge branch 'MDL-51566-master' of git://github.com/jleyva/moodle

diff --cc lib/db/services.php
index cf69112,13786f2..328801b
--- 1/lib/db/services.php
--- 2/lib/db/services.php
+++ b/lib/db/services.php
@@@ -1246,8 -1237,7 +1246,9 @@@ $services = array
              'mod_choice_submit_choice_response',
              'mod_choice_view_choice',
              'mod_choice_get_choices_by_courses',
+             'mod_choice_delete_choice_responses',
 +            'mod_lti_get_tool_launch_data',
 +            'mod_lti_get_ltis_by_courses',
              'mod_imscp_view_imscp',
              'mod_imscp_get_imscps_by_courses',
              ),

diff --cc mod/choice/classes/external.php
Simple merge

diff --cc version.php
index 40d823b,0713a53..dccf152
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2015100700.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2015100200.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2015100700.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.