Merge branch 'master' of richardwhiuk.com:ii-diss
authorRichard Whitehouse <github@richardwhiuk.com>
Mon, 16 May 2011 23:21:34 +0000 (00:21 +0100)
committerRichard Whitehouse <github@richardwhiuk.com>
Mon, 16 May 2011 23:21:34 +0000 (00:21 +0100)

Trivial merge