From: Mike Taylor <mike@indexdata.com>
Date: Tue, 22 Jul 2014 16:37:33 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
X-Git-Tag: 1.0.0~371^2~10^2
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=c36dbaa2cdf9eb4f0ed64a56fc0940646c1bf741

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

c36dbaa2cdf9eb4f0ed64a56fc0940646c1bf741