From: Mark Otto <markotto@twitter.com>
Date: Sun, 19 Feb 2012 23:04:52 +0000 (-0800)
Subject: Merge branch 'alert-headers' of https://github.com/jacobrask/bootstrap into jacobrask... 
X-Git-Tag: v2.0.2~141
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3470c0dc49aa3f66630b2166391df88f1fbd0757;p=thirdparty%2Fbootstrap.git

Merge branch 'alert-headers' of https://github.com/jacobrask/bootstrap into jacobrask-alert-headers

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

3470c0dc49aa3f66630b2166391df88f1fbd0757
diff --cc docs/assets/bootstrap.zip
index cdbb2c88e7,069727cf0f..811291999d
Binary files differ