projects / kamaki / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f2051b9 9d84caa)
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)
Conflicts:
README.Upgrade
kamaki/clients/compute/__init__.py


Trivial merge
Kamaki