kostyliki
Merge branch 'master' of github.com:cocaine/cocaine-framework-native

Conflicts:
	include/cocaine/framework/services/logger.hpp

.