Merge branch 'hotfix-0.4.4' into develop
authorNikos Skalkotos <skalkoto@grnet.gr>
Wed, 31 Jul 2013 12:53:59 +0000 (15:53 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Wed, 31 Jul 2013 12:53:59 +0000 (15:53 +0300)
commit6f391961317833dba163eb4cda1685264e1a1de5
treeb8f2eeab71662f8999b94a9c27e38b3a4afaca54
parentc5effe03956a8200b923dfbc528abb80be45bdcb
parent3784c7c1e1cf4a2636fa54820e1de2b8e404bd31
Merge branch 'hotfix-0.4.4' into develop

Conflicts:
image_creator/os_type/unix.py
image_creator/version.py
version
image_creator/os_type/__init__.py
image_creator/os_type/unix.py
image_creator/version.py
version