]> git.ipfire.org Git - thirdparty/moment.git/commitdiff
Fixing merge conflicts 1727/head
authorAndre Polykanine A.K.A. Menelion Elensúlë <andre@oire.org>
Sun, 6 Jul 2014 12:28:38 +0000 (15:28 +0300)
committerAndre Polykanine A.K.A. Menelion Elensúlë <andre@oire.org>
Sun, 6 Jul 2014 12:28:38 +0000 (15:28 +0300)

Trivial merge