From: Mike Taylor <mike@indexdata.com>
Date: Fri, 14 Nov 2014 12:48:18 +0000 (+0000)
Subject: Resolve conflicts
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;ds=sidebyside;h=e6353cd614e8c2566d2562a6725bf854ed3ab3dc;hp=-c;p=irspy-moved-to-github.git

Resolve conflicts
---

e6353cd614e8c2566d2562a6725bf854ed3ab3dc