Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Wed, 15 Jan 2014 12:03:44 +0000 (12:03 +0000)
committerMike Taylor <mike@indexdata.com>
Wed, 15 Jan 2014 12:03:44 +0000 (12:03 +0000)

Trivial merge