Added by Christos Stavrakakis almost 11 years ago
Merge branch 'master' into debian
Conflicts: version