[pan2/testing: 48/279] Merge branches 'master' and 'file_upload'

[Heinrich MÃller <henmull src gnome org>]

commit 8dc33203d4489dc18dab01ecc8967c363a429b23
Merge: 2ed6e42 d9b048c
Author: Heinrich Mueller <sphemuel stud informatik uni-erlangen de>
Date:   Wed May 25 18:54:38 2011 +0200

    Merge branches 'master' and 'file_upload'

 pan/data/file-queue.cc       |   60 ++++++++++++++++++++
 pan/data/file-queue.h        |   77 ++++++++++++++++++++++++++
 pan/gui/dl-headers-ui.cc     |    4 +-
 pan/gui/gui.cc               |    3 -
 pan/gui/pan.cc               |   18 +-----
 pan/gui/post-ui.cc           |   69 ++++++++++++++---------
 pan/gui/post-ui.h            |    4 +-
 pan/gui/server-ui.cc         |    9 ++-
 pan/tasks/Makefile.am        |    4 +-
 pan/tasks/nntp.cc            |   52 ++++++++++++++++-
 pan/tasks/nntp.h             |   52 +----------------
 pan/tasks/queue.cc           |   13 +----
 pan/tasks/task-xover.cc      |  125 ++++++------------------------------------
 pan/tasks/task-xover.h       |   12 ----
 pan/tasks/task-xzver-test.cc |  114 ++++++++++++++++++++++++++++++++++++++
 pan/tasks/task-xzver-test.h  |   61 ++++++++++++++++++++
 16 files changed, 439 insertions(+), 238 deletions(-)
---