From: Chris Rebert <code@rebertia.com>
Date: Wed, 18 Jun 2014 00:57:07 +0000 (-0700)
Subject: Merge branch 'erwanjegouzo-master'
X-Git-Tag: v3.2.0~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4300d430e6fd3c332eff78fe579002c25af44c23;p=thirdparty%2Fbootstrap.git

Merge branch 'erwanjegouzo-master'
---

4300d430e6fd3c332eff78fe579002c25af44c23