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