Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
authorMike Taylor <mike@indexdata.com>
Fri, 7 Nov 2014 22:20:45 +0000 (22:20 +0000)
committerMike Taylor <mike@indexdata.com>
Fri, 7 Nov 2014 22:20:45 +0000 (22:20 +0000)

Trivial merge