From: fat <jacobthornton@gmail.com>
Date: Tue, 24 Jun 2014 06:08:44 +0000 (-0700)
Subject: Merge branch 'fix-13386'
X-Git-Tag: v3.2.0~7^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0e98adebf949e83ffadcd1604ea5c1a3b3fe531;p=thirdparty%2Fbootstrap.git

Merge branch 'fix-13386'
---

a0e98adebf949e83ffadcd1604ea5c1a3b3fe531