Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Thu, 19 Dec 2013 15:34:04 +0000 (15:34 +0000)
committerMike Taylor <mike@indexdata.com>
Thu, 19 Dec 2013 15:34:04 +0000 (15:34 +0000)

Trivial merge