Merge branch 'maint'

Conflicts:
	lib/libalpm/sync.c
	test/pacman/tests/ignore007.py

1 files changed, 1 insertions, 1 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 748eb5fc..6405cf01 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -52,7 +52,7 @@ EXTRA_DIST = \
 	$(DOXYGEN_MANS)
 
 # Files that should be removed, but which Automake does not know.
-MOSTLYCLEANFILES = *.xml $(ASCIIDOC_MANS) $(HTML_DOCS) repo-remove.8
+MOSTLYCLEANFILES = *.xml $(ASCIIDOC_MANS) $(HTML_DOCS) repo-remove.8 website.tar.gz
 
 # Ensure manpages are fresh when building a dist tarball
 dist-hook: