From: Mark Otto <otto@github.com>
Date: Fri, 28 Dec 2012 19:08:49 +0000 (-0600)
Subject: Merge branch 'sparanoid-transition-duration' into 2.3.0-wip
X-Git-Tag: v2.3.0^2~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f8e315b1dd5a478630b365733b49e1765e96283;p=thirdparty%2Fbootstrap.git

Merge branch 'sparanoid-transition-duration' into 2.3.0-wip

Conflicts:
	docs/assets/img/bootstrap-docs-readme.png
---

6f8e315b1dd5a478630b365733b49e1765e96283