From: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Date: Thu, 4 Dec 2014 12:01:31 +0000 (+0100)
Subject: Merge branch 'master' of /home/kas/html/git/heater
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=heater.git;a=commitdiff_plain;h=3019ff6b696fef6dcad9ad3529b0598074202f94;hp=3019ff6b696fef6dcad9ad3529b0598074202f94

Merge branch 'master' of /home/kas/html/git/heater
---