Merge branch 'master' into develop
authorNikos Skalkotos <skalkoto@grnet.gr>
Thu, 18 Jul 2013 08:26:14 +0000 (11:26 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Thu, 18 Jul 2013 08:26:14 +0000 (11:26 +0300)
commit64556e630fdf69f62ef08bd77f25aa49205f91cc
tree4d190463b73b4bf4c98cab2fb52c402567d61195
parent519e9f2d41fabbd74236b13a3069e672d113bc27
parenta527dcb458768523d7a43313bcbc34e9d8c24e4b
Merge branch 'master' into develop

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