Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Tue, 8 Jul 2014 12:46:53 +0000 (12:46 +0000)
committerMike Taylor <mike@indexdata.com>
Tue, 8 Jul 2014 12:46:53 +0000 (12:46 +0000)

Trivial merge