[pan2/testing: 209/279] Merge branch 'master' of github.com:judgefudge/pan2

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

commit ff9b6495775b4be75214156810ba20e5fa677cb3
Merge: 0a70b74 db9cd97
Author: Heinrich MÃller <sphemuel stud informatik uni-erlangen de>
Date:   Mon Sep 26 11:39:27 2011 +0200

    Merge branch 'master' of github.com:judgefudge/pan2

 pan/data/encode-cache.cc  |    2 +-
 pan/general/debug.cc      |    1 +
 pan/general/debug.h       |    7 +++++
 pan/gui/gui.cc            |   62 ++------------------------------------------
 pan/gui/gui.h             |   11 +------
 pan/gui/log-ui.cc         |    2 -
 pan/gui/pan.cc            |   28 +++++++++++---------
 pan/gui/post-ui.cc        |    7 +---
 pan/gui/post-ui.h         |    2 -
 pan/tasks/task-article.cc |   18 +++++++++++-
 pan/tasks/task-post.cc    |    8 +++--
 uulib/uuencode.c          |    2 +-
 12 files changed, 53 insertions(+), 97 deletions(-)
---