SystemTray: QML version #3

[Marco Martin]

On Tuesday 23 October 2012, Dmitry Ashkadov wrote:
> 23.10.2012 12:44, Marco Martin пишет:
> > On Tuesday 23 October 2012, Luca Beltrame wrote:
> >> In data martedì 23 ottobre 2012 12:28:44, Dmitry Ashkadov ha scritto:
> >>> it shows only dark blue circle. I've fixed this blue circle. Now blue
> >>> circle of kmail works for me. Could you try choqok&  kmail again?
> >> 
> >> I tried with Choqok and it works now. Thanks.
> > 
> > i really think it should be merged now (today?)
> > then problems fixed when they surface, but not delayed anymore
> 
> So, should I merge it today into master? Should I use git merge or git
> rebase?
yep, let's do that ;)
git merge is fine.

Cheers,
Marco Martin