Merging libpurple branch into killerbee. It's fairly usable already, and

Debian packaging is now properly separated. This also picks up a load of
stuff from mainline it seems.

1 files changed, 1 insertions, 0 deletions

diff --git a/lib/misc.h b/lib/misc.h
index ce36caf5..9f2058b6 100644
--- a/lib/misc.h
+++ b/lib/misc.h
@@ -42,6 +42,7 @@ G_MODULE_EXPORT char *add_cr( char *text );
 G_MODULE_EXPORT char *strip_newlines(char *source);
 
 G_MODULE_EXPORT time_t get_time( int year, int month, int day, int hour, int min, int sec );
+G_MODULE_EXPORT time_t mktime_utc( struct tm *tp );
 double gettime( void );
 
 G_MODULE_EXPORT void strip_html( char *msg );