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

Trivial merge