Author: Dan Poltawski
Merge branch 'MD-31803' of git://github.com/mouneyrac/moodle
Conflicts:
admin/index.php
admin/renderer.php
version.php
http://git.moodle.org/gw?p=moodle.git;a=commit;h=b3245b758ce315bd505096b6a2c40641234ec6da
http://github.com/moodle/moodle/commit/b3245b758ce315bd505096b6a2c40641234ec6da
+ 2.3 en [hubs,core_admin]
+ 2.3 en [register,core_admin]
+ 2.3 en [registermoodleorg,core_admin]
+ 2.3 en [registermoodleorgli1,core_admin]
+ 2.3 en [registermoodleorgli2,core_admin]
+ 2.3 en [registermoodleorgli3,core_admin]
+ 2.3 en [registerwithmoodleorg,core_admin]
+ 2.3 en [registration_help,core_admin]
+ 2.3 en [registrationwarning,core_admin]
+ 2.3 en [statsmoodleorg,core_admin]
+ 2.3 en [registeredon,core_hub]
+ 2.3 en [registermoochtips,core_hub]
+ 2.3 en [registerwith,core_hub]
- 2.3 en [moodleorgregistrationdetail,core_hub]
- 2.3 en [moodleorgregistrationdetail2,core_hub]
- 2.3 en [registeron,core_hub]
- 2.3 en [registeronmoodleorg,core_hub]
- 2.3 en [registeronspecifichub,core_hub]
- 2.3 en [specifichub,core_hub]