Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/irspy
authorJohn Malconian <malc@indexdata.com>
Fri, 7 Nov 2014 16:42:36 +0000 (16:42 +0000)
committerJohn Malconian <malc@indexdata.com>
Fri, 7 Nov 2014 16:42:36 +0000 (16:42 +0000)

Trivial merge