From: Isaac Cambron <isaac@isaaccambron.com>
Date: Wed, 2 Oct 2013 21:31:22 +0000 (-0400)
Subject: merging from develop
X-Git-Tag: 2.3.0~6^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1142%2Fhead;p=thirdparty%2Fmoment.git

merging from develop
---

d9840730e70dc147d275eb43c76003e1b04e77fc