amartynov 4e7472de3d Merge branch 'dev' of http://git.stu.neva.ru/cloudtechlab/devops-service into dev ... Conflicts: devops-service/tests/generate_tests.rb		2014-07-15 12:58:41 +04:00
..
api_v2	Merge branch 'dev' of http://git.stu.neva.ru/cloudtechlab/devops-service into dev	2014-07-15 12:58:41 +04:00