From: Mark Otto <markdotto@gmail.com>
Date: Tue, 24 Jan 2012 18:45:51 +0000 (-0800)
Subject: Merge branch 'apostrophe-grammar' of https://github.com/phopkins/bootstrap into phopk... 
X-Git-Tag: v2.0.0~6^2~234
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72861dfbf2759d6ea51ee557def37f85fb5f647d;p=thirdparty%2Fbootstrap.git

Merge branch 'apostrophe-grammar' of https://github.com/phopkins/bootstrap into phopkins-apostrophe-grammar
---

72861dfbf2759d6ea51ee557def37f85fb5f647d
diff --cc docs/components.html
index 9d28b9e06b,e3d67aad56..3a15541c4a
mode 100644,100755..100644
--- a/docs/components.html
+++ b/docs/components.html