Juan Batiz-Benet ab83c52431 Merge branch 'master' into ipns ... Conflicts: cmd/ipfs/ipfs.go		2014-10-09 03:46:35 -07:00
..
config_test.go	test(config) add path assertion	2014-09-12 04:36:07 -07:00
config.go	Merge branch 'master' into ipns	2014-10-09 03:46:35 -07:00
serialize.go	config: Made WriteConfigFile create config parent directory if it doesn't exist	2014-09-11 13:06:51 -07:00