Merge branch 'new_gpg' into new_gpg_autoexchange

Conflicts:
	main.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/log.h b/log.h
index 64a8ad4..2acf09d 100644
--- a/log.h
+++ b/log.h
@@ -32,4 +32,4 @@ private:
 	boost::mutex log_mutex;
 };
 
-#endif

+#endif