Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Fri, 28 Feb 2014 16:32:36 +0000 (16:32 +0000)
committerMike Taylor <mike@indexdata.com>
Fri, 28 Feb 2014 16:32:36 +0000 (16:32 +0000)

Trivial merge