Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
authorMike Taylor <mike@indexdata.com>
Fri, 17 Oct 2014 09:26:38 +0000 (10:26 +0100)
committerMike Taylor <mike@indexdata.com>
Fri, 17 Oct 2014 09:26:38 +0000 (10:26 +0100)

Trivial merge