Merge branch 'master' of ssh://gnunet.org/gnunet

Conflicts:
	src/multicast/test_multicast_multipeer.c

1 files changed, 3 insertions, 1 deletions

diff --git a/src/testing/testing.c b/src/testing/testing.c
index 043bdd7d2..bab7976ea 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -1633,7 +1633,9 @@ GNUNET_TESTING_service_run (const char *testdir,
   char *binary;
   char *libexec_binary;
 
-  GNUNET_log_setup (testdir, "WARNING", NULL);
+  GNUNET_log_setup (testdir,
+                    "WARNING",
+                    NULL);
   system = GNUNET_TESTING_system_create (testdir, "127.0.0.1", NULL, NULL);
   if (NULL == system)
     return 1;