Bogdan Dobrelya dc21bd3f7b Merge branch 'master' into nova-api
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>

Conflicts:
	example-puppet.py
2015-07-29 11:47:56 +02:00
..
2015-07-29 11:47:56 +02:00