]> git.itanic.dy.fi Git - emerge-timer/commitdiff
Merge branch 'master' of itanic.dy.fi:/home/git/emerge-timer
authorEsko Kokkonen <esko.kokkonen@gmail.com>
Sat, 20 Aug 2011 08:56:07 +0000 (11:56 +0300)
committerEsko Kokkonen <esko.kokkonen@gmail.com>
Sat, 20 Aug 2011 08:56:07 +0000 (11:56 +0300)
1  2 
emerge-timer.py

diff --cc emerge-timer.py
Simple merge