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

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

3d079e67e89ea4df0ace1f9b09af121f48ea6a01