From: Andre Polykanine A.K.A. Menelion Elensúlë <andre@oire.org>
Date: Sun, 6 Jul 2014 12:28:38 +0000 (+0300)
Subject: Fixing merge conflicts
X-Git-Tag: 2.8.0~22^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1727%2Fhead;p=thirdparty%2Fmoment.git

Fixing merge conflicts
---

08ff506852abf3af405157c1418dc71456ba37ab