Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Fri, 10 Jan 2014 14:31:12 +0000 (14:31 +0000)
committerMike Taylor <mike@indexdata.com>
Fri, 10 Jan 2014 14:31:12 +0000 (14:31 +0000)

Trivial merge