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~81^2~11^2~1^2~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87a317f42fbe6e1312937bc0cfa05a97f10a8096;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
---

87a317f42fbe6e1312937bc0cfa05a97f10a8096