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

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

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

59d570fc160c71dc21f77735e9d14797e247d859
diff --cc docs/assets/bootstrap.zip
index 811291999d,307e72ac92..6dedf14358
Binary files differ