Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/irspy
authorMike Taylor <mike@indexdata.com>
Mon, 15 Dec 2014 17:08:17 +0000 (17:08 +0000)
committerMike Taylor <mike@indexdata.com>
Mon, 15 Dec 2014 17:08:17 +0000 (17:08 +0000)

Trivial merge