Merge branch 'fix_social'

diff --cc src/core/gnunet-service-core_kx.c
Simple merge

diff --cc src/social/gnunet-social.c
index de680b11c55dd51a254a085f1ce166cdfb39a5d1,0de8809ff42db7e182d007f24c89d0604de9f595..12c5bf2e189f3de339d42614cd676266d0286cba
--- 1/src/social/gnunet-social.c
--- 2/src/social/gnunet-social.c
+++ b/src/social/gnunet-social.c
@@@ -281,9 -281,9 +281,9 @@@ exit_fail (
   * This also indicates the end of the connection to the service.
   */
  static void
 -host_left ()
 +host_left (void *cls)
  {
-   GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+   GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
                "The host has left the place.\n");
    exit_success ();
  }

diff --cc src/social/social_api.c
Simple merge

diff --cc src/util/scheduler.c
Simple merge