Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Fri, 6 Jun 2014 14:21:09 +0000 (15:21 +0100)
committerMike Taylor <mike@indexdata.com>
Fri, 6 Jun 2014 14:21:09 +0000 (15:21 +0100)

Trivial merge