commit 6637615f9c7abf6a32487df94caabc253f68df2d Merge: 181910a ca44acd Author: Paul Howarth <paul at city-fan.org> Date: Fri Nov 9 21:58:30 2012 +0000 Merge branch 'master' into f18 ---