From: Michal Skalski <mskalski@mirantis.com>
Date: Wed, 3 Feb 2016 08:17:45 +0000 (+0000)
Subject: Merge "Sync with upstream repository"
X-Git-Tag: colorado.1.rc1~237
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c8270c2bbb594624e55b76d8f56dd38a195718b5;p=fuel.git

Merge "Sync with upstream repository"
---

c8270c2bbb594624e55b76d8f56dd38a195718b5