From: Mark Otto <markotto@twitter.com>
Date: Wed, 22 Feb 2012 16:12:51 +0000 (-0800)
Subject: Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
X-Git-Tag: v2.0.2~107
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4410ede8ed976f449d9b1735652e081ed863a131;p=thirdparty%2Fbootstrap.git

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

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

4410ede8ed976f449d9b1735652e081ed863a131
diff --cc docs/assets/bootstrap.zip
index bbb57eadbb,142b613775..2a5e598c17
Binary files differ