From: Mike Taylor <mike@indexdata.com>
Date: Thu, 27 Feb 2014 15:10:23 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~1390^2~2
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=facb2740654aa936b06b3f67512181ec952e0e7c

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

facb2740654aa936b06b3f67512181ec952e0e7c