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

diff --git a/lib/db/services.php b/lib/db/services.php
index 54902d9..3cf83c7 100644 (file)
--- a/lib/db/services.php
+++ b/lib/db/services.php
@@ -1173,6 +1173,7 @@ $services = array(
             'core_user_get_users_by_id',
             'core_webservice_get_site_info',
             'core_notes_create_notes',
+            'core_notes_delete_notes',
             'core_user_get_course_user_profiles',
             'core_message_send_instant_messages',
             'mod_assign_get_grades',

diff --git a/version.php b/version.php
index 2be622c..acd1dd7 100644 (file)
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2015121800.00;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2015122100.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.