]> rtime.felk.cvut.cz Git - jailhouse-test.git/commitdiff
projects / jailhouse-test.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6efa90 2f94fa8)
Merge branch 'master' of rtime.felk.cvut.cz:jailhouse-test
authorMaxim Baryshnikov <barysmax@fel.cvut.cz>
Thu, 18 Feb 2016 15:42:56 +0000 (16:42 +0100)
committerMaxim Baryshnikov <barysmax@fel.cvut.cz>
Thu, 18 Feb 2016 15:42:56 +0000 (16:42 +0100)

Trivial merge