Merge pull request #1349 from ichernev/feature/iso-long-year-format

author Isaac Cambron <isaac@isaaccambron.com>

Wed, 11 Dec 2013 18:19:16 +0000 (10:19 -0800)

committer Isaac Cambron <isaac@isaaccambron.com>

Wed, 11 Dec 2013 18:19:16 +0000 (10:19 -0800)
author Isaac Cambron <isaac@isaaccambron.com>
Wed, 11 Dec 2013 18:19:16 +0000 (10:19 -0800)
committer Isaac Cambron <isaac@isaaccambron.com>
Wed, 11 Dec 2013 18:19:16 +0000 (10:19 -0800)
diff --cc moment.js
Simple merge
diff --cc test/moment/format.js
Simple merge
author	Isaac Cambron <isaac@isaaccambron.com>
	Wed, 11 Dec 2013 18:19:16 +0000 (10:19 -0800)
committer	Isaac Cambron <isaac@isaaccambron.com>
	Wed, 11 Dec 2013 18:19:16 +0000 (10:19 -0800)
		1	2
moment.js	patch \|	diff1 \|	diff2 \|	blob \| history
test/moment/format.js	patch \|	diff1 \|	diff2 \|	blob \| history