Merge remote-tracking branch 'kali/feature/imap_keymanager_events' into develop
authorTomás Touceda <chiiph@leap.se>
Fri, 16 Aug 2013 17:08:13 +0000 (14:08 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 16 Aug 2013 17:08:13 +0000 (14:08 -0300)

Trivial merge