Merge pull request #1418 from ichernev/bugfix/strict-parsing-non-padded-units

author Isaac Cambron <isaac@isaaccambron.com>

Tue, 14 Jan 2014 20:11:57 +0000 (12:11 -0800)

committer Isaac Cambron <isaac@isaaccambron.com>

Tue, 14 Jan 2014 20:11:57 +0000 (12:11 -0800)
author Isaac Cambron <isaac@isaaccambron.com>
Tue, 14 Jan 2014 20:11:57 +0000 (12:11 -0800)
committer Isaac Cambron <isaac@isaaccambron.com>
Tue, 14 Jan 2014 20:11:57 +0000 (12:11 -0800)
diff --cc moment.js
Simple merge
diff --cc test/moment/create.js
Simple merge
author	Isaac Cambron <isaac@isaaccambron.com>
	Tue, 14 Jan 2014 20:11:57 +0000 (12:11 -0800)
committer	Isaac Cambron <isaac@isaaccambron.com>
	Tue, 14 Jan 2014 20:11:57 +0000 (12:11 -0800)
		1	2
moment.js	patch \|	diff1 \|	diff2 \|	blob \| history
test/moment/create.js	patch \|	diff1 \|	diff2 \|	blob \| history