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

diff --cc lib/db/services.php
index 419dac5,79228fd..aed15b9
--- 1/lib/db/services.php
--- 2/lib/db/services.php
+++ b/lib/db/services.php
@@@ -1166,11 -1166,8 +1166,12 @@@ $services = array
              'mod_chat_send_chat_message',
              'mod_chat_get_chat_latest_messages',
              'mod_chat_view_chat',
+             'mod_chat_get_chats_by_courses',
              'mod_book_view_book',
 +            'mod_choice_get_choice_results',
 +            'mod_choice_get_choice_options',
 +            'mod_choice_submit_choice_response',
 +            'mod_choice_view_choice',
              ),
          'enabled' => 0,
          'restrictedusers' => 0,

diff --cc version.php
index 3433b03,163ebd6..7abced9
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2015090901.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2015090900.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2015090902.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.