Merge branch 'patch-2' of https://github.com/designagencytom/Umbraco-CMS into designagencytom-patch-2

Shazwazza · Shazwazza · commit 81600f0f3c17 · 2014-03-24T11:18:11.000+11:00
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
@@ -158,7 +158,10 @@ protected override void OnLoad(EventArgs e)
             _memberGroups.ID = "Membergroups";
             _memberGroups.Width = 175;
             var selectedMembers = "";
-            foreach (var role in Roles.GetAllRoles())
+			var roles = Roles.GetAllRoles();
+            		Array.Sort(roles);
+
+			foreach(var role in roles)
             {
                 // if a role starts with __umbracoRole we won't show it as it's an internal role used for public access
                 if (role.StartsWith("__umbracoRole") == false)
