From: Mark Otto <markdotto@gmail.com>
Date: Thu, 2 Feb 2012 00:45:25 +0000 (-0800)
Subject: Merge branch 'master' of github.com:twitter/bootstrap
X-Git-Tag: v2.0.1~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f166c5a35b9a037fa0e314ce111812f4b7ef741e;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	docs/assets/bootstrap.zip
---

f166c5a35b9a037fa0e314ce111812f4b7ef741e
diff --cc docs/assets/bootstrap.zip
index a75e75ca89,b8ba926d3c..7efe21437e
Binary files differ