Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
authorMike Taylor <mike@indexdata.com>
Thu, 23 Oct 2014 15:14:22 +0000 (16:14 +0100)
committerMike Taylor <mike@indexdata.com>
Thu, 23 Oct 2014 15:14:22 +0000 (16:14 +0100)

Trivial merge