From: Mark Otto <otto@github.com>
Date: Mon, 19 Aug 2013 06:52:22 +0000 (-0700)
Subject: Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
X-Git-Tag: v3.0.0~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7a7cb479fa53b38524f2f79cac262a0736be97b;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	getting-started.html
---

f7a7cb479fa53b38524f2f79cac262a0736be97b