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

Trivial merge