]> rtime.felk.cvut.cz Git - jailhouse.git/commitdiff
Merge branch 'master' of rtime.felk.cvut.cz:jailhouse
authorMaxim Baryshnikov <barysmax@fel.cvut.cz>
Mon, 18 Apr 2016 14:38:30 +0000 (16:38 +0200)
committerMaxim Baryshnikov <barysmax@fel.cvut.cz>
Mon, 18 Apr 2016 14:38:30 +0000 (16:38 +0200)

Trivial merge