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

diff --cc src/multicast/test_multicast_multipeer.c
index 0fb515f54343e9093384bd08646e50e9bb114221,7df1a8213e3d1c5cd91c7c35cc5f8022b1273e5f..65c51c2e38af14c234b1bfbe810185f40cf757c6
--- 1/src/multicast/test_multicast_multipeer.c
--- 2/src/multicast/test_multicast_multipeer.c
+++ b/src/multicast/test_multicast_multipeer.c
@@@ -547,14 -546,13 +546,14 @@@ service_connect (void *cls
   * @param PEERS_REQUESTED size of the 'peers' array
   * @param links_succeeded number of links between peers that were created
   * @param links_failed number of links testbed was unable to establish
 - */ static void
 + */ 
 +static void
  testbed_master (void *cls,
-      struct GNUNET_TESTBED_RunHandle *h,
-      unsigned int num_peers,
-      struct GNUNET_TESTBED_Peer **p,
-      unsigned int links_succeeded,
-      unsigned int links_failed)
+                 struct GNUNET_TESTBED_RunHandle *h,
+                 unsigned int num_peers,
+                 struct GNUNET_TESTBED_Peer **p,
+                 unsigned int links_succeeded,
+                 unsigned int links_failed)
  {
    /* Testbed is ready with peers running and connected in a pre-defined overlay
       topology (FIXME)  */