diff --git a/ChangeLog b/ChangeLog
index 815c1a29e..6e5b86f9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,12 @@
 	do not attempt to access targetChangeKeys when NULL, to avoid a
 	SEGFAULT.
 
+2012-08-14  Jean Raby  <jraby@inverse.ca>
+
+	* OpenChange/GNUmakefile: use version_info[{0,1}] instead of
+	version_info.{major,minor} when checking for legacy version
+	of python since these named attributes where added in python2.7
+
 2012-08-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreSOGo.m (sogo_properties_get_uri): removed
@@ -129,6 +135,11 @@
 	* OpenChange/MAPIStoreSOGoObject.m (-objectId): force generation
 	of objectId by parent, whether it is a folder or not.
 
+2012-08-07  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/Contacts/UIxListEditor.m (-setReferencesValue:): check for
+	duplicates in the new list, not in the previous version.
+
 2012-08-03  Jean Raby  <jraby@inverse.ca>
 
 	* SoObjects/SOGo/LDAPSource.m (changePasswordForLogin):
diff --git a/Documentation/SOGo Installation Guide.odt b/Documentation/SOGo Installation Guide.odt
index fa87d24f0..b120fb26c 100644
Binary files a/Documentation/SOGo Installation Guide.odt and b/Documentation/SOGo Installation Guide.odt differ
diff --git a/OpenChange/GNUmakefile b/OpenChange/GNUmakefile
index 0db45e325..1174670b2 100644
--- a/OpenChange/GNUmakefile
+++ b/OpenChange/GNUmakefile
@@ -27,7 +27,7 @@ BUNDLE_INSTALL_DIR = $(SOGO_LIBDIR)
 UNRTF_DIR = unrtf-$(UNRTF_VERSION)
 
 PYTHON = /usr/bin/python
-PYTHON_IS_GOOD = $(shell $(PYTHON) -c 'from sys import version_info; a=version_info; print a.major == 2 and a.minor >= 6')
+PYTHON_IS_GOOD = $(shell $(PYTHON) -c 'from sys import version_info; a=version_info; print a[0] == 2 and a[1] >= 6')
 ifeq (${PYTHON_IS_GOOD},False)
 PYTHON = /usr/bin/python2.6
 endif
diff --git a/UI/Contacts/UIxListEditor.m b/UI/Contacts/UIxListEditor.m
index b13677e5f..d9478b9cc 100644
--- a/UI/Contacts/UIxListEditor.m
+++ b/UI/Contacts/UIxListEditor.m
@@ -147,7 +147,7 @@
       for (i = 0; i < count; i++)
         {
           currentReference = [references objectAtIndex: i];
-          if (![self cardReferences: initialReferences 
+          if (![self cardReferences: [list cardReferences] 
                             contain: currentReference])
             {
               // Search contact by vCard UID
diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings
index ee816ede3..f65aa84f2 100644
--- a/UI/PreferencesUI/English.lproj/Localizable.strings
+++ b/UI/PreferencesUI/English.lproj/Localizable.strings
@@ -282,6 +282,7 @@
 "Label 4" = "Label 4";
 "Label 5" = "Label 5";
 
+"The password was changed successfully." = "The password was changed successfully.";
 "Password must not be empty." = "Password must not be empty.";
 "The passwords do not match. Please try again." = "The passwords do not match. Please try again.";
 "Password change failed" = "Password change failed";
diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings
index 8e0538417..750217e85 100644
--- a/UI/PreferencesUI/French.lproj/Localizable.strings
+++ b/UI/PreferencesUI/French.lproj/Localizable.strings
@@ -282,6 +282,7 @@
 "Label 4" = "étiquette 4";
 "Label 5" = "étiquette 5";
 
+"The password was changed successfully." = "Votre mot de passe a bien été changé.";
 "Password must not be empty." = "Le mot de passe ne doit pas être vide.";
 "The passwords do not match. Please try again." = "Les mots de passe ne sont pas identiques. Essayez de nouveau.";
 "Password change failed" = "Échec au changement";