Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Fri, 13 Dec 2013 15:44:05 +0000 (15:44 +0000)
committerMike Taylor <mike@indexdata.com>
Fri, 13 Dec 2013 15:44:05 +0000 (15:44 +0000)

Trivial merge