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

Trivial merge