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

Trivial merge