Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-11-18 17:40:33 -04:00
commit 69dd546cda
1 changed files with 1 additions and 1 deletions