Merge branch 'maint'

Just a slight touchup in makepkg due to the [ -> [[ conversion, so nothing
to see here.

Conflicts:
	scripts/makepkg.sh.in

lib/libalpm/alpm.c

@@ -71,6 +71,7 @@ int SYMEXPORT alpm_release(void)
 	}
 
 	_alpm_handle_free(handle);
+	handle = NULL;
 
 	return(0);
 }