merge the two entries

svn path=/plone.app.users/branches/1.0/; revision=46468

CHANGES.txt

@@ -4,21 +4,18 @@ Changelog
 1.0.3 - unreleased
 ------------------
 
-- Fixed UnicodeDecodeError caused by wrong groups vocabulary (token and value
-  in terms were switched). This closes http://dev.plone.org/plone/ticket/11316
-  [vincentfretin]
-
 - Don't assume that fields in the user schema will be saved in property sheets
   when a new user registers. Instead, adapt the navigation root to the user
   schema to get the same adapter as is used on the Personal Information form,
   and use it to save the values from the registration form.
   [davisagli]
 
-- Fix critical error on add user page
+- Fixed critical error on add user page
   when some groups have a non-ascii character in their title.
   Sort groups on their title normalized.
-  Similar as http://dev.plone.org/plone/ticket/11301
-  [thomasdesvenain]
+  Token and value in terms in the groups vocabulary were switched.
+  This closes http://dev.plone.org/plone/ticket/11316
+  [thomasdesvenain, vincentfretin, davisagli]
 
 1.0.2 - 2010-11-24
 ------------------