From: Esko Kokkonen <esko.kokkonen@gmail.com>
Date: Thu, 4 Sep 2014 14:55:28 +0000 (+0300)
Subject: Merge branch 'master' of /home/git/emerge-timer
X-Git-Url: http://git.itanic.dy.fi/?p=emerge-timer;a=commitdiff_plain;h=c786224a13a947b2d89cc82e22397b84d715574f

Merge branch 'master' of /home/git/emerge-timer
---

c786224a13a947b2d89cc82e22397b84d715574f