merging from develop

author Isaac Cambron <isaac@isaaccambron.com>

Wed, 2 Oct 2013 21:31:22 +0000 (17:31 -0400)

committer Isaac Cambron <isaac@isaaccambron.com>

Wed, 2 Oct 2013 21:31:22 +0000 (17:31 -0400)
author Isaac Cambron <isaac@isaaccambron.com>
Wed, 2 Oct 2013 21:31:22 +0000 (17:31 -0400)
committer Isaac Cambron <isaac@isaaccambron.com>
Wed, 2 Oct 2013 21:31:22 +0000 (17:31 -0400)
diff --cc moment.js
Simple merge
diff --cc test/moment/lang.js
Simple merge
author	Isaac Cambron <isaac@isaaccambron.com>
	Wed, 2 Oct 2013 21:31:22 +0000 (17:31 -0400)
committer	Isaac Cambron <isaac@isaaccambron.com>
	Wed, 2 Oct 2013 21:31:22 +0000 (17:31 -0400)
		1	2
moment.js	patch \|	diff1 \|	diff2 \|	blob \| history
test/moment/lang.js	patch \|	diff1 \|	diff2 \|	blob \| history