Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
authorMike Taylor <mike@indexdata.com>
Wed, 29 Oct 2014 10:42:12 +0000 (10:42 +0000)
committerMike Taylor <mike@indexdata.com>
Wed, 29 Oct 2014 10:42:12 +0000 (10:42 +0000)

Trivial merge