Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-04-19 17:11:52 -04:00
commit 30743e350e
1 changed files with 10 additions and 10 deletions