From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 29 Jul 2013 17:04:44 +0000 (+0200)
Subject: Merge branch '1.x-maintenance'
X-Git-Tag: 2.0~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed16910373d55decd1d3ded0173bc32e33400719;p=thirdparty%2Fbabel.git

Merge branch '1.x-maintenance'
---

ed16910373d55decd1d3ded0173bc32e33400719