4 commits

Author	SHA1	Message	Date
indexzero	76db254740	[fix test] Update nconf.stores.File to respond with an error when loading malformed JSON async	2011-06-08 00:06:58 -04:00
indexzero	4459ba54a1	[api] Added .merge() to stores.Memory and stores.Redis	2011-06-05 01:29:14 -04:00
indexzero	0fd847cc33	[doc] Updates to README.md	2011-04-02 04:59:18 -04:00
indexzero	09b8c75383	[api test doc] Internal fixes from testing. More tests and docs	2011-04-02 04:31:20 -04:00