chiark / gitweb /
rules: second round merging with Ubuntu rules