[kupfer: 5/6] Merge remote-tracking branch 'karol/bugfix/zim'

[Ulrik Sverdrup <usverdrup src gnome org>]

commit 3cdca5d1a7d457d182d0d54590d59c1cc5a1e1ef
Merge: 20a7f40 1a047d7
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Tue Dec 13 18:53:43 2011 +0100

    Merge remote-tracking branch 'karol/bugfix/zim'
    
    * karol/bugfix/zim:
      zim: add quick note action
      zim: fix problem with loading notebook list in zim 0.53

 kupfer/plugin/zim.py |  191 +++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 159 insertions(+), 32 deletions(-)
---