Added by Dimitris Aragiorgis over 10 years ago
Merge branch 'develop'
Conflicts: version
Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>