Added by Stavros Sachtouris over 10 years ago
Merge remote-tracking branch 'origin/debian-master' into debian-wheezy