Merge branch 'hotfix-0.4.1' into develop
authorNikos Skalkotos <skalkoto@grnet.gr>
Wed, 26 Jun 2013 17:09:26 +0000 (20:09 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Wed, 26 Jun 2013 17:09:26 +0000 (20:09 +0300)
commitae887b5769374393b895e29c824819504a12e8c7
tree4ab418dbd24adea4a5f94e57f7d2af8569bb9756
parent67b7037562ff4e86563173c9784f73c822b1d940
parentb8c0848cfd861d27083c6bf3d5e4cb70009918ab
Merge branch 'hotfix-0.4.1' into develop

Conflicts:
image_creator/version.py
version