Merge branch 'hotfix-0.5.2' into develop
authorNikos Skalkotos <skalkoto@grnet.gr>
Mon, 9 Sep 2013 08:09:58 +0000 (11:09 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Mon, 9 Sep 2013 08:09:58 +0000 (11:09 +0300)
commit6b81adfd297f33fc6f0249f792ca1a2e86f825b4
tree5215e403ae15edd4639d53a8a997911f18988735
parent694ca1e98dc4205edf249999f97ee27429b35a96
parentf97dbc42b9c9622cf63da87ebabcafce1396e420
Merge branch 'hotfix-0.5.2' into develop

Conflicts:
image_creator/version.py
version
image_creator/version.py
version