version · af59d6cfd9e954dd5fc5c5e562e2e65a93855879 · itminedu / snf-image-creator · GitLab

Jan 18, 2014
09911be6
Merge branch 'master' into develop · 09911be6
Nikos Skalkotos authored Jan 18, 2014
```
Conflicts:
	image_creator/version.py
	version
```
09911be6
Merge branch 'master' into develop
Nikos Skalkotos authored Jan 18, 2014
```
Conflicts:
	image_creator/version.py
	version
```