Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/irspy
authorMike Taylor <mike@miketaylor.org.uk>
Thu, 16 Dec 2010 17:36:30 +0000 (17:36 +0000)
committerMike Taylor <mike@miketaylor.org.uk>
Thu, 16 Dec 2010 17:36:30 +0000 (17:36 +0000)

Trivial merge