]> Pileus Git - ~andy/fetchmail/commit - po/sq.po
Merge remote branch 'upstream/master'
authorBen Kibbey <bjk@luxsci.net>
Mon, 24 May 2010 00:16:18 +0000 (20:16 -0400)
committerBen Kibbey <bjk@luxsci.net>
Mon, 24 May 2010 00:16:18 +0000 (20:16 -0400)
commit82d02e1f39249cce1362c0a41c4fe2a7005ae835
tree6e2db0750f0927775c110f7d9a82683d57497fc0
parentf0eb725f677dd7e152dc3b9cc40984b535048837
parentef52da8277d8c3cff8a49999675b8c5f06d3d0c1
Merge remote branch 'upstream/master'

Conflicts:
rcfile_y.y
Makefile.am
configure.ac
fetchmail.c
fetchmail.h
options.c
rcfile_l.l
rcfile_y.y