1. 18 Dec, 2012 1 commit
    • Stavros Sachtouris's avatar
      Merge remote-tracking branch 'origin/develop' into feature-windows · fba9be97
      Stavros Sachtouris authored
      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
      fba9be97
  2. 17 Dec, 2012 6 commits
  3. 14 Dec, 2012 7 commits
  4. 12 Dec, 2012 21 commits
  5. 11 Dec, 2012 4 commits
  6. 10 Dec, 2012 1 commit