Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
authorMike Taylor <mike@indexdata.com>
Mon, 10 Nov 2014 17:05:39 +0000 (17:05 +0000)
committerMike Taylor <mike@indexdata.com>
Mon, 10 Nov 2014 17:05:39 +0000 (17:05 +0000)

Trivial merge