Merge branch 'dionyziz' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 5 Dec 2012 09:47:33 +0000 (11:47 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 5 Dec 2012 09:47:33 +0000 (11:47 +0200)
commit0520885994837a486c07704b88d9b72e30a4aed5
treed57b25869c462fc4caa3204efd5387d4068512ca
parent8574a687abfd5403b669b8672a531f2e0664d22f
parente8f5d642e0ff67f2ec8ee1f99e8ade2fb1d547f7
Merge branch 'dionyziz' into develop

Conflicts:
setup.py

Docs adjusted
docs/conf.py
kamaki/clients/connection/kamakicon.py
kamaki/clients/tests.py