Merge branch 'master' of git@83.233.175.44:hermes
authorAndrew Flegg <andrew@bleb.org>
Wed, 9 Jun 2010 22:24:09 +0000 (23:24 +0100)
committerAndrew Flegg <andrew@bleb.org>
Wed, 9 Jun 2010 22:24:09 +0000 (23:24 +0100)

Trivial merge