From: Mark Otto <otto@github.com>
Date: Mon, 14 Oct 2013 18:06:25 +0000 (-0700)
Subject: Merge branch 'master' of github.com:twbs/bootstrap
X-Git-Tag: v3.0.1~39^2~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6307d2c94d879e802610e366087bff75883d70a4;p=thirdparty%2Fbootstrap.git

Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
	getting-started.html
---

6307d2c94d879e802610e366087bff75883d70a4