From: Mark Otto <markdotto@gmail.com>
Date: Tue, 8 Dec 2015 07:48:41 +0000 (-0800)
Subject: Merge branch 'bassjobsen-patch-6' into v4-dev
X-Git-Tag: v4.0.0-alpha.2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96dd9c57d20ff6bcb95bf7d4ca00acce9422a6f5;p=thirdparty%2Fbootstrap.git

Merge branch 'bassjobsen-patch-6' into v4-dev
---

96dd9c57d20ff6bcb95bf7d4ca00acce9422a6f5