Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Wed, 4 Dec 2013 12:43:55 +0000 (12:43 +0000)
committerMike Taylor <mike@indexdata.com>
Wed, 4 Dec 2013 12:43:55 +0000 (12:43 +0000)

Trivial merge