Merge branch 'master' of ssh://civodul@git.savannah.gnu.org/srv/git/gnutls
commitb70070b6b11327e7967c83ad77e9d35fa2db05a9
authorLudovic Courtès <ludo@gnu.org>
Thu, 17 Apr 2008 12:18:13 +0000 (17 14:18 +0200)
committerLudovic Courtès <ludo@gnu.org>
Thu, 17 Apr 2008 12:18:13 +0000 (17 14:18 +0200)
tree7f20d36c1102b7bb35c7325f1cdb0a97f6d97f35
parentd5b3b9c5b4cd118cb3229f3b64d8bda146bf7b1b
parent2b4f4e3fd2b0df0b77b283928154b5f3e9139fe8
Merge branch 'master' of ssh://civodul@git.savannah.gnu.org/srv/git/gnutls

Conflicts:

configure.in
configure.in