Merge remote-tracking branch 'chiiph-github/feature/add_unread_imap_event' into develop
authorKali Kaneko <kali@leap.se>
Tue, 20 Aug 2013 15:49:31 +0000 (17:49 +0200)
committerKali Kaneko <kali@leap.se>
Tue, 20 Aug 2013 15:49:31 +0000 (17:49 +0200)

Trivial merge