X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=ChangeLog;h=c429aae0735f70f43ea965d56bcb30ebb595f791;hp=dcc48ebdcfca314512fd89612cae8ca6636f0787;hb=0c0b1cd6aef8af14fa964a7f00e4ca4dae5d260f;hpb=237bf4ff2f52b1cef5b79ca07536fc2cf8e8cff1

diff --git a/ChangeLog b/ChangeLog
index dcc48ebdc..c429aae07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-12-15 [colin]	3.6.1cvs78
+
+	* src/compose.c
+	* src/privacy.c
+	* src/privacy.h
+	* src/plugins/pgpcore/sgpgme.c
+	* src/plugins/pgpcore/sgpgme.h
+	* src/plugins/pgpinline/pgpinline.c
+	* src/plugins/pgpmime/pgpmime.c
+	* src/plugins/smime/smime.c
+		Fix bug 1796, 'PGP/MIME setting: "select key by your 
+		email address" doesn't work'. Use custom from address
+		if set
+
 2008-12-15 [colin]	3.6.1cvs77
 
 	* src/common/utils.c