Merge branch 'feature-json-output' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 22 May 2013 15:05:00 +0000 (18:05 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 22 May 2013 15:05:00 +0000 (18:05 +0300)
commit117ca598ba23ab400b84d2e46251873aa427bafc
tree1a0788340b64f797a255dd60d920c09d8959e285
parent6aadd6e11a2d2a83a39c6fa3fe1c68441616bac8
parentd9301a7a65618ebd784b2e24f1d000eb853038be
Merge branch 'feature-json-output' into develop

Conflicts:
Changelog
kamaki/cli/commands/image.py

Also, take care of pep8 issues
Changelog
kamaki/cli/commands/cyclades.py
kamaki/cli/commands/image.py
kamaki/cli/commands/pithos.py
kamaki/clients/pithos/__init__.py