Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-04-14 02:45:58 -04:00
commit a1e3c4e9e0
1 changed files with 1 additions and 1 deletions