From: Mike Taylor <mike@indexdata.com>
Date: Fri, 24 Jan 2014 14:42:00 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~1607
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=7ef7961d0f71d9fea8e9ec020efa0391b5b31ceb

Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
---

7ef7961d0f71d9fea8e9ec020efa0391b5b31ceb