From: Martin Vajnar <martin.vajnar@gmail.com>
Date: Thu, 30 Jul 2015 12:26:59 +0000 (+0200)
Subject: Merge branch 'master' into personal/vajnamar/merge-fixes
X-Git-Tag: eaton-0.5.5~10
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/pes-rpp/rpp-test-sw.git/commitdiff_plain/595471045b004ba8dbfc7c45a7047639c17aab7c

Merge branch 'master' into personal/vajnamar/merge-fixes
---

595471045b004ba8dbfc7c45a7047639c17aab7c