Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
authorMike Taylor <mike@indexdata.com>
Thu, 22 Jan 2015 12:05:35 +0000 (12:05 +0000)
committerMike Taylor <mike@indexdata.com>
Thu, 22 Jan 2015 12:05:35 +0000 (12:05 +0000)

Trivial merge