Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Mon, 27 Jan 2014 17:26:44 +0000 (17:26 +0000)
committerMike Taylor <mike@indexdata.com>
Mon, 27 Jan 2014 17:26:44 +0000 (17:26 +0000)

Trivial merge