chiark / gitweb /
Merge branch stable into master