Merge branch 'new_gpg' into new_gpg_autoexchange

Conflicts:
	messages.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/main.h b/main.h
index 102821c..e4ff5f2 100644
--- a/main.h
+++ b/main.h
@@ -18,7 +18,7 @@
 

 struct contact_data

 {

-	list<string> msgs_to_tag, msgs_to_ignore, msgs_to_send;

+	list<string>  msgs_to_send, msgs_to_pass;

 	string key_in_prescense;

 };