Merge branch 'feature/test-all-zones' into develop

author Tim Wood <washwithcare@gmail.com>

Fri, 4 May 2012 01:21:22 +0000 (18:21 -0700)

committer Tim Wood <washwithcare@gmail.com>

Fri, 4 May 2012 01:21:22 +0000 (18:21 -0700)
author Tim Wood <washwithcare@gmail.com>
Fri, 4 May 2012 01:21:22 +0000 (18:21 -0700)
committer Tim Wood <washwithcare@gmail.com>
Fri, 4 May 2012 01:21:22 +0000 (18:21 -0700)
diff --cc Makefile
Simple merge
diff --cc test/moment/utc.js
Simple merge
author	Tim Wood <washwithcare@gmail.com>
	Fri, 4 May 2012 01:21:22 +0000 (18:21 -0700)
committer	Tim Wood <washwithcare@gmail.com>
	Fri, 4 May 2012 01:21:22 +0000 (18:21 -0700)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
test/moment/utc.js	patch \|	diff1 \|	diff2 \|	blob \| history