projects / snf-network / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e6c6f5 22023e8)
Merge branch 'develop'
authorDimitris Aragiorgis <dimara@grnet.gr>
Tue, 29 Oct 2013 13:07:20 +0000 (15:07 +0200)
committerDimitris Aragiorgis <dimara@grnet.gr>
Tue, 29 Oct 2013 13:07:20 +0000 (15:07 +0200)
Conflicts:
version

Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>


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