From: Mike Taylor <mike@indexdata.com>
Date: Tue, 17 Dec 2013 14:00:21 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 0.9.1~34^2~30
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=2e86ff244341252f5346a0b863b4578731a46c2c

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

2e86ff244341252f5346a0b863b4578731a46c2c