[kupfer: 3/4] Merge remote branch 'karol/plugin_filezilla'

[Ulrik Sverdrup <usverdrup src gnome org>]

commit 1e10e3a05811a13ad3fb3d81ed0a736b2acee160
Merge: 4659f25 b5255b1
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Sat May 8 23:52:03 2010 +0200

    Merge remote branch 'karol/plugin_filezilla'
    
    * karol/plugin_filezilla:
      +filezilla - load sites from Filezilla and handle ftp-urls
      obj.hosts.HostLeaf: allow to put custom slots in obj constructor

 kupfer/obj/hosts.py        |   13 +++--
 kupfer/plugin/filezilla.py |  137 ++++++++++++++++++++++++++++++++++++++++++++
 po/POTFILES.in             |    1 +
 3 files changed, 146 insertions(+), 5 deletions(-)
---