projects / snf-image-creator / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 67b7037 b8c0848)
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)
Conflicts:
image_creator/version.py
version


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.