]> Pileus Git - ~andy/fetchmail/commit - fetchmail.h
Merge branch 'master' into next
authorMatthias Andree <matthias.andree@gmx.de>
Tue, 14 Dec 2010 17:00:15 +0000 (18:00 +0100)
committerMatthias Andree <matthias.andree@gmx.de>
Tue, 14 Dec 2010 17:00:15 +0000 (18:00 +0100)
commit98bdc445738682c067752f8d467c2b0841fc6306
treedde4c605a6180f87e71e173c2687a29bcfa3cb40
parentb2a2c59e5bd05597283dad6b3b6ea6a077a97420
parent3718805edd205a4eb557205b0dbc476fa765d339
Merge branch 'master' into next

Conflicts:
fm_md5.h
pop3.c
fm_md5.h