From: Mike Taylor <mike@indexdata.com>
Date: Fri, 7 Nov 2014 22:20:45 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
X-Git-Tag: 1.0.0~39
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=bd1beab56a2ee826ce63f19ebc8a9b5d3644937e

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

bd1beab56a2ee826ce63f19ebc8a9b5d3644937e