From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 27 Nov 2013 10:16:46 +0000 (+0000)
Subject: Merge "fixes test_kill_pids_in_file conflicts"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=925d83ccc20070795ba30c3f135f120a8b9a5ee0;p=openstack-build%2Fneutron-build.git

Merge "fixes test_kill_pids_in_file conflicts"
---

925d83ccc20070795ba30c3f135f120a8b9a5ee0