Merge branch 'master' into ff/dns
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 5 Nov 2006 12:10:09 +0000 (13:10 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 5 Nov 2006 12:10:09 +0000 (13:10 +0100)
commita25ac81f5bd545fc52301596eb22cd45782958c9
treef28a8e185798af3eba0d9eb00659a83361602df7
parentd8057e8ffaad5518af96d82e0cbd8da44fb425ea
parentdfe12aadb65933d7dd15d5e42d3c6218900bed15
Merge branch 'master' into ff/dns
configure.in