Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Thu, 23 Jan 2014 12:28:33 +0000 (12:28 +0000)
committerMike Taylor <mike@indexdata.com>
Thu, 23 Jan 2014 12:28:33 +0000 (12:28 +0000)

Trivial merge