Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Thu, 10 Jul 2014 16:45:49 +0000 (17:45 +0100)
committerMike Taylor <mike@indexdata.com>
Thu, 10 Jul 2014 16:45:49 +0000 (17:45 +0100)

Trivial merge