Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
authorMike Taylor <mike@indexdata.com>
Fri, 9 Jan 2015 11:37:55 +0000 (11:37 +0000)
committerMike Taylor <mike@indexdata.com>
Fri, 9 Jan 2015 11:37:55 +0000 (11:37 +0000)

Trivial merge