Merge branch 'develop'
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 21 Feb 2013 13:41:59 +0000 (15:41 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 21 Feb 2013 13:41:59 +0000 (15:41 +0200)
commit4e59b158a08b6fc991230282ec8ade4ddb8de2b7
treea668bb5a9f83f9aec85759854a4a5a4eb7974e45
parent9524ba6753e1cd4578098b99f8af59c9394b9879
parent79b4f17768fce3c129dc1a476b3a5b10368dc034
Merge branch 'develop'

Conflicts:
Changelog
kamaki/__init__.py
setup.py
Changelog
kamaki/__init__.py
setup.py
version