From: Mark Otto <otto@github.com>
Date: Thu, 19 Jun 2014 05:29:37 +0000 (-0700)
Subject: Merge branch 'master' into new_striped_progress_bar_class
X-Git-Tag: v3.2.0~32^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4eb5552b369e42026807edf469242df4ebd78ab;p=thirdparty%2Fbootstrap.git

Merge branch 'master' into new_striped_progress_bar_class
---

d4eb5552b369e42026807edf469242df4ebd78ab