Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
authorMike Taylor <mike@indexdata.com>
Tue, 9 Dec 2014 15:12:47 +0000 (15:12 +0000)
committerMike Taylor <mike@indexdata.com>
Tue, 9 Dec 2014 15:12:47 +0000 (15:12 +0000)

Trivial merge