]> rtime.felk.cvut.cz Git - jailhouse-test.git/commitdiff
projects / jailhouse-test.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f5a392 788e626)
Merge branch 'master' of rtime.felk.cvut.cz:jailhouse-test
authorMaxim Baryshnikov <barysmax@fel.cvut.cz>
Tue, 3 May 2016 00:11:43 +0000 (02:11 +0200)
committerMaxim Baryshnikov <barysmax@fel.cvut.cz>
Tue, 3 May 2016 00:11:43 +0000 (02:11 +0200)

Trivial merge