Pileus Git - ~andy/fetchmail/commit

]> Pileus Git - ~andy/fetchmail/commit

author	Matthias Andree <matthias.andree@gmx.de>
	Mon, 13 Dec 2010 20:44:43 +0000 (21:44 +0100)
committer	Matthias Andree <matthias.andree@gmx.de>
	Mon, 13 Dec 2010 20:44:43 +0000 (21:44 +0100)
commit	a86b31feb8dc61c13de5ef7ddf4cf816841e79c7
tree	bfb992b5b83d5cba7db136236692bdb566818f8c	tree \| snapshot
parent	95b270bd0819edefbd256385f69cc0c3a4656232	commit \| diff
parent	82d02e1f39249cce1362c0a41c4fe2a7005ae835	commit \| diff

Merge commit 'refs/merge-requests/1' of gitorious.org:fetchmail/fetchmail into integration

Conflicts:
fetchmail.c
fetchmail.h

Andy's fetchmail repository