From: Tim Wood <washwithcare@gmail.com>
Date: Fri, 4 May 2012 17:01:16 +0000 (-0700)
Subject: Merge pull request #300 from conanca/master
X-Git-Tag: 1.7.0~40^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22176d500f19ab9beb255498ca280dbdf69a7ff2;p=thirdparty%2Fmoment.git

Merge pull request #300 from conanca/master

correct the translation of "future"
---

22176d500f19ab9beb255498ca280dbdf69a7ff2