]> rtime.felk.cvut.cz Git - jailhouse-test.git/commitdiff
projects / jailhouse-test.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06d5196 0a77110)
Merge branch 'master' of rtime.felk.cvut.cz:jailhouse-test
authorMaxim Baryshnikov <barysmax@fel.cvut.cz>
Sat, 16 Apr 2016 13:46:17 +0000 (15:46 +0200)
committerMaxim Baryshnikov <barysmax@fel.cvut.cz>
Sat, 16 Apr 2016 13:46:17 +0000 (15:46 +0200)

Trivial merge