Merge branch 'MDL-35998' of git://github.com/mouneyrac/moodle

Conflicts:
	version.php

diff --cc lang/en/admin.php
index 2498fef,6547942..81a2e36
--- 1/lang/en/admin.php
--- 2/lang/en/admin.php
+++ b/lang/en/admin.php
@@@ -258,6 -255,7 +258,7 @@@ $string['configminpasswordlength'] = 'P
  $string['configminpasswordlower'] = 'Passwords must have at least these many lower case letters.';
  $string['configminpasswordnonalphanum'] = 'Passwords must have at least these many non-alphanumeric characters.';
  $string['configminpasswordupper'] = 'Passwords must have at least these many upper case letters.';
 -$string['configmobilecssurl'] = 'Custom CSS file to customize your mobile app interface.';
++$string['configmobilecssurl'] = 'A CSS file to customise your mobile app interface.';
  $string['configmodchooserdefault'] = 'Should the activity chooser be presented to users by default?';
  $string['configmycoursesperpage'] = 'Maximum number of courses to display in any list of a user\'s own courses';
  $string['configmymoodleredirect'] = 'This setting forces redirects to /my on login for non-admins and replaces the top level site navigation with /my';

diff --cc lib/adminlib.php
Simple merge

diff --cc version.php
index 30e6f3e,8b5ac6c..81dcd62
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -30,7 -30,7 +30,7 @@@
  defined('MOODLE_INTERNAL') || die();
  
  
- $version  = 2012110201.01;              // YYYYMMDD      = weekly release date of this DEV branch
 -$version  = 2012101800.01;              // YYYYMMDD      = weekly release date of this DEV branch
++$version  = 2012110201.02;              // YYYYMMDD      = weekly release date of this DEV branch
                                          //         RR    = release increments - 00 in DEV branches
                                          //           .XX = incremental changes