projects / snf-image / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8e75e6 61b7981)
Merge branch 'develop' into hotfix-0.9.3
authorNikos Skalkotos <skalkoto@grnet.gr>
Mon, 2 Sep 2013 14:05:20 +0000 (17:05 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Mon, 2 Sep 2013 14:05:20 +0000 (17:05 +0300)
Conflicts:
version


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