ChangeLog: do not omit merge commits

Merge commits usually contain bug number references.

Author: mtomaschewski

Makefile.am

@@ -40,7 +40,7 @@ $(distdir)/wicked.spec: wicked.spec
 
 $(distdir)/ChangeLog: check-git-tool
 	@if  [ -d $(top_srcdir)/.git ]; then \
-	  LANG=C git log --no-merges -- $(top_srcdir) > $(distdir)/ChangeLog ; \
+	  LANG=C git log -- $(top_srcdir) > $(distdir)/ChangeLog ; \
 	fi
 
 show-commit-state: check-git-tool