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

Trivial merge