]> rtime.felk.cvut.cz Git - orte.git/commitdiff
Merge branch 'master' of https://github.com/Vajnar/orte
authorMichal Sojka <sojkam1@fel.cvut.cz>
Wed, 10 Jun 2015 22:20:42 +0000 (00:20 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Wed, 10 Jun 2015 22:20:42 +0000 (00:20 +0200)

Trivial merge