From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sat, 27 Jul 2013 11:00:09 +0000 (+0200)
Subject: Merge branch '1.x-maintenance'
X-Git-Tag: 2.0~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e274ac505e9c2fddaca27a9798bda483c5b6632c;p=thirdparty%2Fbabel.git

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

e274ac505e9c2fddaca27a9798bda483c5b6632c