From: Mike Taylor <mike@indexdata.com>
Date: Tue, 4 Nov 2014 15:27:23 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
X-Git-Tag: 1.0.0~83^2~5^2
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=7b8f519897c9b6ac4da2b83080ecd0fb6127b802

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

7b8f519897c9b6ac4da2b83080ecd0fb6127b802