Merging in 1.2.5.

1 files changed, 1 insertions, 0 deletions

diff --git a/conf.h b/conf.h
index c41fd096..b112681d 100644
--- a/conf.h
+++ b/conf.h
@@ -49,6 +49,7 @@ typedef struct conf
 	int ping_interval;
 	int ping_timeout;
 	char *user;
+	char **protocols;
 } conf_t;
 
 G_GNUC_MALLOC conf_t *conf_load( int argc, char *argv[] );