3 commits

Author	SHA1	Message	Date
Michael Schoonmaker	5d2ebfbe9f	Added test to confirm merging an Object and null behaves as expected.	2012-12-20 19:02:36 -08:00
Jonathan Stewmon	fdb73f007b	updated tests to verify that Provider.load respects hierarchy	2012-01-02 17:12:08 -05:00
indexzero	fb392ddc51	[api test] Updated test/provider-test.js and associated merge implementation	2011-08-28 08:50:26 -04:00