Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
authorMike Taylor <mike@indexdata.com>
Fri, 5 Jun 2015 08:36:49 +0000 (09:36 +0100)
committerMike Taylor <mike@indexdata.com>
Fri, 5 Jun 2015 08:36:49 +0000 (09:36 +0100)

Trivial merge