chiark / gitweb /
Merge branch 'stable' into stable-master-merge