Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gnutls
authorSimon Josefsson <simon@josefsson.org>
Mon, 8 Oct 2007 09:38:26 +0000 (11:38 +0200)
committerSimon Josefsson <simon@josefsson.org>
Mon, 8 Oct 2007 09:38:26 +0000 (11:38 +0200)
commit1b07f0e8cfb9c72513c5e74d357846a4453af947
tree1885da37a2c7549091f11f0f9cfcc70afd2bcbbb
parentff08fecaebf983e5a66882734d4f71a714685b06
parent1f24725c9a0b09e7a42ee18f2bb4c0fbac581b8f
Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gnutls

Conflicts:

NEWS
NEWS