From: Heli Hyvättinen <heli.hyvattinen@kymp.net>
Date: Sun, 14 Aug 2011 11:46:28 +0000 (+0300)
Subject: Merge branch 'sticky2'
X-Git-Tag: v0.4.0~6
X-Git-Url: https://vcs.maemo.org/git/?p=kitchenalert;a=commitdiff_plain;h=e3d78d642357c3cbd65564b4784088d548b1ba6a

Merge branch 'sticky2'
---

e3d78d642357c3cbd65564b4784088d548b1ba6a