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

Trivial merge