From: Chris Rebert <code@rebertia.com>
Date: Mon, 8 Sep 2014 06:07:38 +0000 (-0700)
Subject: Merge branch 'stefansundin/master'
X-Git-Tag: v3.3.0~197
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f56233862a9706cec0131e272d7bf7c0ca9f90c;p=thirdparty%2Fbootstrap.git

Merge branch 'stefansundin/master'
---

7f56233862a9706cec0131e272d7bf7c0ca9f90c