Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Wed, 5 Feb 2014 00:28:53 +0000 (00:28 +0000)
committerMike Taylor <mike@indexdata.com>
Wed, 5 Feb 2014 00:28:53 +0000 (00:28 +0000)

Trivial merge