merged in upstream r379 (somewhere after 1.2-3).

Just one trivial conflict in the jabber Makefile, went smoothly.

1 files changed, 2 insertions, 0 deletions

diff --git a/lib/misc.h b/lib/misc.h
index 7804bfb1..a2acada6 100644
--- a/lib/misc.h
+++ b/lib/misc.h
@@ -66,4 +66,6 @@ G_MODULE_EXPORT char *word_wrap( char *msg, int line_len );
 
 G_MODULE_EXPORT gboolean ssl_sockerr_again( void *ssl );
 
+G_MODULE_EXPORT int md5_verify_password( char *password, char *hash );
+
 #endif