From: Mark Otto <markdotto@gmail.com>
Date: Sun, 26 Oct 2014 21:17:14 +0000 (-0700)
Subject: Merge branch 'need-to-activate-animated-progressbar' of github.com:twbs/bootstrap... 
X-Git-Tag: v3.3.0~22^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=657ff31c7448563abc7b11e0cfea971e060a3d3d;p=thirdparty%2Fbootstrap.git

Merge branch 'need-to-activate-animated-progressbar' of github.com:twbs/bootstrap into need-to-activate-animated-progressbar

Conflicts:
	docs/_includes/components/progress-bars.html
	docs/assets/js/src/application.js
---

657ff31c7448563abc7b11e0cfea971e060a3d3d