Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Wed, 13 Nov 2013 19:22:12 +0000 (19:22 +0000)
committerMike Taylor <mike@indexdata.com>
Wed, 13 Nov 2013 19:22:12 +0000 (19:22 +0000)

Trivial merge