Added by Christos Stavrakakis over 11 years ago
Merge branch 'debian-develop' into debian
Conflicts: debian/control debian/rules