From: Jan Kratochvil Date: Fri, 12 Oct 2012 19:00:46 +0000 (+0200) Subject: Merge branch 'master' into pending X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cfc54a25aecf456d2ef84d02e8d8466b98a6c861;p=thirdparty%2Felfutils.git Merge branch 'master' into pending Conflicts: backends/ChangeLog src/ChangeLog src/readelf.c --- cfc54a25aecf456d2ef84d02e8d8466b98a6c861