From: Martin Vajnar <martin.vajnar@gmail.com>
Date: Fri, 13 Sep 2013 08:25:26 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git@rtime.felk.cvut.cz/orte into android
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/orte.git/commitdiff_plain/c3756b64914521d20f583c1b40bd6dae4ce5516f?hp=-c

Merge branch 'master' of ssh://git@rtime.felk.cvut.cz/orte into android
---

c3756b64914521d20f583c1b40bd6dae4ce5516f