From: Lasse Schuirmann <lasse@schuirmann.net>
Date: Mon, 21 Sep 2015 14:45:57 +0000 (+0200)
Subject: Merge branch '2.x-maintenance' into 2.x-maintenance
X-Git-Tag: 2.1.1~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F225%2Fhead;p=thirdparty%2Fbabel.git

Merge branch '2.x-maintenance' into 2.x-maintenance
---

3fc88e1066b27270dee415aa53d3f5c1030a7b48