Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Thu, 12 Jun 2014 12:02:42 +0000 (13:02 +0100)
committerMike Taylor <mike@indexdata.com>
Thu, 12 Jun 2014 12:02:42 +0000 (13:02 +0100)

Trivial merge