From: Mike Taylor <mike@indexdata.com>
Date: Wed, 5 Nov 2014 15:42:42 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
X-Git-Tag: 1.0.0~78^2~2
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=9b573629ab386fab536d2d23e808b5563edf2756;p=mkws-moved-to-github.git

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

9b573629ab386fab536d2d23e808b5563edf2756