Merge pull request #1545 from icambron/abstracted-year-parsing

author Iskren Ivov Chernev <iskren.chernev@gmail.com>

Wed, 2 Apr 2014 07:51:22 +0000 (00:51 -0700)

committer Iskren Ivov Chernev <iskren.chernev@gmail.com>

Wed, 2 Apr 2014 07:51:22 +0000 (00:51 -0700)
author Iskren Ivov Chernev <iskren.chernev@gmail.com>
Wed, 2 Apr 2014 07:51:22 +0000 (00:51 -0700)
committer Iskren Ivov Chernev <iskren.chernev@gmail.com>
Wed, 2 Apr 2014 07:51:22 +0000 (00:51 -0700)
diff --cc moment.js
Simple merge
diff --cc test/moment/create.js
Simple merge
author	Iskren Ivov Chernev <iskren.chernev@gmail.com>
	Wed, 2 Apr 2014 07:51:22 +0000 (00:51 -0700)
committer	Iskren Ivov Chernev <iskren.chernev@gmail.com>
	Wed, 2 Apr 2014 07:51:22 +0000 (00:51 -0700)
		1	2
moment.js	patch \|	diff1 \|	diff2 \|	blob \| history
test/moment/create.js	patch \|	diff1 \|	diff2 \|	blob \| history