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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/conf.c b/conf.c
index 7aac7d9a..6955b23f 100644
--- a/conf.c
+++ b/conf.c
@@ -252,7 +252,7 @@ static int conf_loadini( conf_t *conf, char *file )
 			else if( g_strcasecmp( ini->key, "account_storage_migrate" ) == 0 )
 			{
 				g_strfreev( conf->migrate_storage );
-				conf->migrate_storage = g_strsplit( ini->value, " \t,;", -1 );
+				conf->migrate_storage = g_strsplit_set( ini->value, " \t,;", -1 );
 			}
 			else if( g_strcasecmp( ini->key, "pinginterval" ) == 0 )
 			{