Added by Christos Stavrakakis over 10 years ago
Merge branch 'release-0.15' into debian-release-0.15