Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-04-19 19:19:37 -04:00
commit 50fb9961f3
1 changed files with 1 additions and 1 deletions