Merge "Build from master with 2014.2.b2"
authorSergey Otpuschennikov <sotpuschennikov@mirantis.com>
Wed, 20 Aug 2014 11:01:59 +0000 (15:01 +0400)
committerGerrit Code Review <gitolite@gitolite.vm.mirantis.net>
Wed, 20 Aug 2014 11:01:59 +0000 (15:01 +0400)

Trivial merge