# HG changeset patch
# User Jim Meyering <meyering@redhat.com>
# Date 1294170983 -3600
# Node ID d29071ddf1265caaec7baf87fe7dfaad7ebc43e4
# Parent  2e06c488128225ce7e3af004ab8ca8e5d3756b6f# Parent  14e96c38e499b489810dc309cc79e9fbe8a879a1
Merge branch 'coreutils-8.9'

diff --git a/ChangeLog b/ChangeLog
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen