Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Wed, 2 Jul 2014 15:00:11 +0000 (16:00 +0100)
committerMike Taylor <mike@indexdata.com>
Wed, 2 Jul 2014 15:00:11 +0000 (16:00 +0100)

Trivial merge