Merge branch 'MD-31803' of git://github.com/mouneyrac/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jun 2012 11:22:06 +0000 (19:22 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jun 2012 11:25:58 +0000 (19:25 +0800)
commitb3245b758ce315bd505096b6a2c40641234ec6da
treea7bed6260e7d32c5acb02f238f95ebde1a944dfb
parenta30167510155dc1202649efefac607bff01dda40
Merge branch 'MD-31803' of git://github.com/mouneyrac/moodle

Conflicts:
admin/index.php
admin/renderer.php
version.php
14 files changed:
admin/index.php
admin/registration/confirmregistration.php
admin/registration/forms.php
admin/registration/hubselector.php [deleted file]
admin/registration/index.php
admin/registration/register.php
admin/registration/renderer.php
admin/registration/renewregistration.php
admin/renderer.php
admin/settings/server.php
admin/settings/top.php
lang/en/admin.php
lang/en/hub.php
version.php