From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Thu, 4 Dec 2014 01:38:43 +0000 (+0100)
Subject: Merge branch 'maint-rm48' into rm48/master
X-Git-Tag: eaton-0.1-beta~1
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/pes-rpp/rpp-test-sw.git/commitdiff_plain/08b0304a279db1161f926fdf42acccd8f42e299c

Merge branch 'maint-rm48' into rm48/master
---

08b0304a279db1161f926fdf42acccd8f42e299c