Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
authorMike Taylor <mike@indexdata.com>
Mon, 23 Feb 2015 10:12:28 +0000 (10:12 +0000)
committerMike Taylor <mike@indexdata.com>
Mon, 23 Feb 2015 10:12:28 +0000 (10:12 +0000)

Trivial merge