From: Mike Taylor <mike@indexdata.com>
Date: Wed, 5 Feb 2014 12:53:49 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~1515^2~14^2
X-Git-Url: http://jsfdemo.indexdata.com/?a=commitdiff_plain;ds=sidebyside;h=c18d9dedf4b4a6b01507076cac7014c9051d3fc7;p=mkws-moved-to-github.git

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

c18d9dedf4b4a6b01507076cac7014c9051d3fc7