[pan2: 138/268] Merge branch 'filters'

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

commit 138e94cf499773c8a232b4826195e31bcf4e5cde
Merge: 8dd35f7 4598db7
Author: Heinrich MÃller <sphemuel stud informatik uni-erlangen de>
Date:   Tue Jul 19 17:33:33 2011 +0200

    Merge branch 'filters'

 pan/general/progress.cc  |    2 ++
 pan/gui/post-ui.cc       |   19 ++++++++-----------
 pan/gui/prefs-ui.cc      |    2 +-
 pan/tasks/encoder.cc     |    1 +
 pan/tasks/task-upload.cc |   29 ++++++++++++++---------------
 pan/tasks/task-upload.h  |    1 -
 6 files changed, 26 insertions(+), 28 deletions(-)
---