Merge tag 'upstream/1.8.5'
authorRaphaël Hertzog <hertzog@debian.org>
Fri, 8 Feb 2013 16:46:54 +0000 (17:46 +0100)
committerRaphaël Hertzog <hertzog@debian.org>
Fri, 8 Feb 2013 16:46:54 +0000 (17:46 +0100)
commit13d2a0df9c25a27d89cd8fbf9f42553c4b2d6e1c
tree77a0861060d919c3d018091eea179d539b84eac6
parent9696c8105cee59a24a9b24ee2f226ca4bbf10968
parent4d0965a6a50be1c1e932da35c6d22195e11876b5
Merge tag 'upstream/1.8.5'

Upstream version 1.8.5

Conflicts:
configure

Reinstate config.guess, config.sub and config.h.in too.