From: Mike Taylor <mike@indexdata.com>
Date: Tue, 9 Jul 2013 12:06:12 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 0.9.1~305^2~3^2
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=aa4072a553e49828bc321d6a0e9340568c626408

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

aa4072a553e49828bc321d6a0e9340568c626408