Merge branch 'master' of ssh://hummus/home/git/pub/git-tools
authorJohn Malconian <malc@indexdata.com>
Tue, 23 Jun 2015 19:04:06 +0000 (19:04 +0000)
committerJohn Malconian <malc@indexdata.com>
Tue, 23 Jun 2015 19:04:06 +0000 (19:04 +0000)

Trivial merge