Merge branch 'develop' into feature-tests
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 26 Feb 2013 10:24:57 +0000 (12:24 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 26 Feb 2013 10:24:57 +0000 (12:24 +0200)
commit622a12fe3b9a88051afdbebec5fbe7dca0b48fef
tree35e02db7b13a21d559f1336fddcfd3172248b2ec
parentd78a998392f2959f0e156b65434762246e587102
parenta517ff50af2ab0201f9bca0753567d609272cd66
Merge branch 'develop' into feature-tests

Conflicts:
kamaki/clients/connection/__init__.py
kamaki/clients/connection/kamakicon.py
kamaki/clients/__init__.py
kamaki/clients/connection/__init__.py
kamaki/clients/connection/kamakicon.py