Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Tue, 22 Jul 2014 16:37:33 +0000 (16:37 +0000)
committerMike Taylor <mike@indexdata.com>
Tue, 22 Jul 2014 16:37:33 +0000 (16:37 +0000)

Trivial merge