Commit 26c33c46 authored by Дмитрий Сафронов's avatar Дмитрий Сафронов
Browse files

Merge branch 'trunk' into 'master' 

Trunk

See merge request ansible/ansible!13
parents 5f8cc4b2 1dd73920