Merge branch 'feature-astakosclient-docs' into hotfix-0.12.1
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 17 Dec 2013 13:04:20 +0000 (15:04 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 17 Dec 2013 13:04:20 +0000 (15:04 +0200)
commit7f8136c4388073e119ee34c57bec2a9254834b0b
tree1a84101af88eb0815f4ca36273eddcad27f54eca
parentf2051b93dd47e8f2249d4a38c7aff8d0f1f13842
parent9d84caa47f5ea28f2ff0ebea500519a82f80d4bb
Merge branch 'feature-astakosclient-docs' into hotfix-0.12.1

Conflicts:
README.Upgrade
kamaki/clients/compute/__init__.py