Merge branch 'master' into develop
authorNikos Skalkotos <skalkoto@grnet.gr>
Sat, 18 Jan 2014 08:42:36 +0000 (10:42 +0200)
committerNikos Skalkotos <skalkoto@grnet.gr>
Sat, 18 Jan 2014 08:42:36 +0000 (10:42 +0200)
commit09911be61dc52ad0c0a222610235fa5977799d65
tree347254328b2f4e509107dbce4e55cf0172101237
parent432840bdccac414db303a1818e6cf840bed3ae47
parent135fd46cd25e0d005722009b938a7139531acf98
Merge branch 'master' into develop

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