Merge branch 'master' into virt_list_domains
authorDenis Silakov <dsilakov@virtuozzo.com>
Thu, 2 Mar 2017 13:32:23 +0000 (16:32 +0300)
committerDenis Silakov <dsilakov@virtuozzo.com>
Thu, 2 Mar 2017 13:32:23 +0000 (16:32 +0300)
commit1c5e82a7eefdbcce608951fa5a00c5c5a43a41e6
tree7051cbd8ea3f79c106fd3db739d2b8eae9463091
parent1aba6b516e5158e67f7bb5bca6df1ae66fdb8393
parent79a94204db8de144bf5bd84159afde444df9e0a4
Merge branch 'master' into virt_list_domains
src/virt.c