Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Mon, 7 Jul 2014 13:07:12 +0000 (14:07 +0100)
committerMike Taylor <mike@indexdata.com>
Mon, 7 Jul 2014 13:07:12 +0000 (14:07 +0100)

Trivial merge