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

Trivial merge