Merge remote-tracking branch 'whot/for-keith'
authorKeith Packard <keithp@keithp.com>
Wed, 12 Mar 2014 05:04:36 +0000 (22:04 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 12 Mar 2014 05:04:36 +0000 (22:04 -0700)
1  2 
config/config.c

diff --cc config/config.c
Simple merge