]> rtime.felk.cvut.cz Git - orte.git/commitdiff
Merge branch 'master' of ssh://git@rtime.felk.cvut.cz/orte into android
authorMartin Vajnar <martin.vajnar@gmail.com>
Fri, 13 Sep 2013 08:25:26 +0000 (10:25 +0200)
committerMartin Vajnar <martin.vajnar@gmail.com>
Fri, 13 Sep 2013 08:25:26 +0000 (10:25 +0200)

Trivial merge