From: jarosluv <hello@jaroslove.ru>
Date: Fri, 25 Oct 2013 20:04:23 +0000 (+0400)
Subject: Merge remote-tracking branch 'origin/develop' into develop
X-Git-Tag: 2.4.0~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1195%2Fhead;p=thirdparty%2Fmoment.git

Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	lang/ru.js
---

b834f94451ea2c42cd7bfbca7d085e4d04192b1a