From: Mark Otto <otto@github.com>
Date: Fri, 15 Feb 2013 07:44:50 +0000 (-0800)
Subject: Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
X-Git-Tag: v3.0.0-rc1~672
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ac2f304a85bc9bfb8b0a23af60adb8c3a144509;p=thirdparty%2Fbootstrap.git

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
	docs/examples/sticky-footer-navbar.html
	docs/examples/sticky-footer.html
---

5ac2f304a85bc9bfb8b0a23af60adb8c3a144509