Added by Christos Stavrakakis about 11 years ago
Merge branch 'master' into debian
Conflicts: MANIFEST.in