]> rtime.felk.cvut.cz Git - pes-rpp/rpp-lib.git/commitdiff
Merge branch 'rm48/master' of rtime.felk.cvut.cz:pes-rpp/rpp-lib into rm48/master
authorMichal Horn <hornmich@fel.cvut.cz>
Wed, 29 Apr 2015 13:15:14 +0000 (15:15 +0200)
committerMichal Horn <hornmich@fel.cvut.cz>
Wed, 29 Apr 2015 13:15:14 +0000 (15:15 +0200)

Trivial merge