Merge remote-tracking branch 'origin/release/2.14/master' into fedora/2.14/master
commit1bb5fe47df5dc69bea6a219e5dff62ec7db88036
authorAndreas Schwab <schwab@redhat.com>
Tue, 28 Jun 2011 11:52:19 +0000 (28 13:52 +0200)
committerAndreas Schwab <schwab@redhat.com>
Tue, 28 Jun 2011 11:52:19 +0000 (28 13:52 +0200)
tree84c0da9d6de3b71c2c4e9bebd1f1b0318cec0ec1
parent18e76460b67080f19576f358a62d0f1d8a7a0d1f
parent96147940d8ffb63efdf84a7f2608eec742df8c61
Merge remote-tracking branch 'origin/release/2.14/master' into fedora/2.14/master
ChangeLog
iconvdata/gb18030.c
sysdeps/posix/getaddrinfo.c