From: Tim Wood <washwithcare@gmail.com>
Date: Wed, 20 Feb 2013 17:35:37 +0000 (-0800)
Subject: Merge branch 'master' into develop
X-Git-Tag: 2.1.0~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a69d8b0a543f1c81698a8908ff45487d590686a9;p=thirdparty%2Fmoment.git

Merge branch 'master' into develop

* master:
  manually duplicating #629
---

a69d8b0a543f1c81698a8908ff45487d590686a9