Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
authorMike Taylor <mike@indexdata.com>
Wed, 5 Nov 2014 18:15:03 +0000 (18:15 +0000)
committerMike Taylor <mike@indexdata.com>
Wed, 5 Nov 2014 18:15:03 +0000 (18:15 +0000)

Trivial merge