From: Mike Taylor <mike@indexdata.com>
Date: Wed, 15 Jan 2014 12:03:44 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~1690^2~1
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=11fabfbff92c502d30f1da9248f7514e3b0420af

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

11fabfbff92c502d30f1da9248f7514e3b0420af