From: Mike Taylor <mike@indexdata.com>
Date: Mon, 13 Jan 2014 15:05:46 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~1692^2~2
X-Git-Url: http://jsfdemo.indexdata.com/?a=commitdiff_plain;h=ba61241dc349eaedd8f021735eb75170471771e3;hp=ba61241dc349eaedd8f021735eb75170471771e3;p=mkws-moved-to-github.git

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