]> Pileus Git - ~andy/fetchmail/commit - TODO.txt
Merge branch 'common-6x'
authorMatthias Andree <matthias.andree@gmx.de>
Mon, 30 May 2011 22:19:32 +0000 (00:19 +0200)
committerMatthias Andree <matthias.andree@gmx.de>
Mon, 30 May 2011 22:19:32 +0000 (00:19 +0200)
commitdbb179567dd2e850e0e8327a823d21ee311db823
tree5e72d65e89b247353bd996091ca3a24e1cd92492
parent7f75be9056b0c5461c20fcf54f0aae8d19535e12
parent7ee9e083f932920866a167846407e507ee558d97
Merge branch 'common-6x'

Conflicts:
Makefile.am
NEWS
fetchmail.c
imap.c
socket.c
NEWS
fetchmail.c
socket.c