From: Mike Taylor <mike@indexdata.com>
Date: Tue, 18 Mar 2014 12:47:31 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~1309^2~5
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=15af7e7f692ea033cd632f0bfe44887a019dd96e

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

15af7e7f692ea033cd632f0bfe44887a019dd96e