From: Esko Kokkonen <esko.kokkonen@gmail.com>
Date: Sun, 18 Sep 2011 14:28:37 +0000 (+0300)
Subject: Merge branch 'testing'
X-Git-Url: http://git.itanic.dy.fi/?p=emerge-timer;a=commitdiff_plain;h=d2683b0bb770994c95453879568d26a1ab0ef883

Merge branch 'testing'

Not really a merge since removed everything that was in 'master'
branch. Stuff might be broken too.
---

d2683b0bb770994c95453879568d26a1ab0ef883