Merge pull request #5876 from slava-sh/nova
authorSergey M. <dstftw@gmail.com>
Wed, 3 Jun 2015 18:18:01 +0000 (23:18 +0500)
committerSergey M. <dstftw@gmail.com>
Wed, 3 Jun 2015 18:18:01 +0000 (23:18 +0500)
[nova] Update


Trivial merge