Mirantis/devops — pull request #9 by angdraug (2013-08-16 23:51:41+00:00)
Title: Merge 2.0 branch to master

As discussed in #8, this branch contains all changes from branch 2.0 rebased onto master.