From: Mark Otto <markotto@twitter.com>
Date: Fri, 23 Mar 2012 00:12:22 +0000 (-0700)
Subject: Merge branch 'brand-link' of https://github.com/ctalkington/bootstrap into ctalkingto... 
X-Git-Tag: v2.0.3~5^2~143
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b59cb505f8cf4e0010f422f0a83d9c001055cbd7;p=thirdparty%2Fbootstrap.git

Merge branch 'brand-link' of https://github.com/ctalkington/bootstrap into ctalkington-brand-link

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

b59cb505f8cf4e0010f422f0a83d9c001055cbd7
diff --cc docs/assets/bootstrap.zip
index 693969290b,7f099d78f9..a7b6950417
Binary files differ