Merge pull request #684 from ichernev/bug/fix-duration-as-getters

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

Tue, 2 Apr 2013 06:55:39 +0000 (23:55 -0700)

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

Tue, 2 Apr 2013 06:55:39 +0000 (23:55 -0700)
author Iskren Ivov Chernev <iskren.chernev@gmail.com>
Tue, 2 Apr 2013 06:55:39 +0000 (23:55 -0700)
committer Iskren Ivov Chernev <iskren.chernev@gmail.com>
Tue, 2 Apr 2013 06:55:39 +0000 (23:55 -0700)
diff --cc moment.js
Simple merge
diff --cc test/moment/duration.js
Simple merge
author	Iskren Ivov Chernev <iskren.chernev@gmail.com>
	Tue, 2 Apr 2013 06:55:39 +0000 (23:55 -0700)
committer	Iskren Ivov Chernev <iskren.chernev@gmail.com>
	Tue, 2 Apr 2013 06:55:39 +0000 (23:55 -0700)
		1	2
moment.js	patch \|	diff1 \|	diff2 \|	blob \| history
test/moment/duration.js	patch \|	diff1 \|	diff2 \|	blob \| history