Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-11-10 16:27:52 -04:00
commit 17d81326ba
1 changed files with 5 additions and 5 deletions