Merge branch 'maint'

Conflicts:
	lib/libalpm/signing.c
	lib/libalpm/sync.c

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index ab7fe319..b43a61b7 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -880,7 +880,7 @@ static int download_single_file(alpm_handle_t *handle, struct dload_payload *pay
 			return 0;
 		}
 
-		free(payload->fileurl);
+		FREE(payload->fileurl);
 		payload->unlink_on_fail = 0;
 	}