Added by Stavros Sachtouris almost 10 years ago
Merge branch 'master' into debian-wheezy
Conflicts: setup.py