Merge branch 'master' into contact_sync

Conflicts:

	src/Makefile.am
	src/iphone.c
	src/lockdown.c
	src/lockdown.h
	src/utils.c

1 files changed, 1 insertions, 1 deletions

diff --git a/src/AFC.c b/src/AFC.c
index a1f7a08..67d37f3 100644
--- a/src/AFC.c
+++ b/src/AFC.c
@@ -227,7 +227,7 @@ static int receive_AFC_data(iphone_afc_client_t client, char **dump_here)
         iphone_mux_recv(client->connection, buffer, sizeof(AFCPacket) * 4, &bytes);
         if (bytes <= 0) {
                 free(buffer);
-                fprintf(stderr, "Just didn't get enough.\n");
+                log_debug_msg("Just didn't get enough.\n");
                 *dump_here = NULL;
                 return -1;
         }