Merge branch 'maint-1.7.0' into maint

* maint-1.7.0:
remove ecb parameter from xdi_diff_outf()

diff --cc diff.c
Simple merge

diff --cc xdiff-interface.c
Simple merge

diff --cc xdiff-interface.h
Simple merge