Merge remote-tracking branch 'origin/develop' into feature-windows
Conflicts: kamaki/cli/__init__.py kamaki/cli/argument.py kamaki/cli/command_shell.py kamaki/cli/command_tree.py kamaki/cli/commands/__init__.py kamaki/cli/commands/astakos_cli.py kamaki/cli/commands/config_cli.py kamaki/cli/commands/cyclades_cli.py kamaki/cli/commands/history_cli.py kamaki/cli/commands/image_cli.py kamaki/cli/commands/pithos_cli.py kamaki/cli/commands/test_cli.py kamaki/cli/config.py kamaki/cli/errors.py kamaki/cli/history.py kamaki/cli/utils.py kamaki/clients/connection/kamakicon.py kamaki/clients/tests.py
kamaki/cli/__init__.py
0 → 100644