From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Wed, 3 Dec 2014 19:06:52 +0000 (+0100)
Subject: Merge branch 'maint-rm48' into rm48/master
X-Git-Tag: eaton-0.1-beta~3
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/pes-rpp/rpp-test-sw.git/commitdiff_plain/4e5acc1e1d8e3d3a0ebc4f5babd915e1b0ff6484

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

4e5acc1e1d8e3d3a0ebc4f5babd915e1b0ff6484