From: Jacob Thornton <jacobthornton@gmail.com>
Date: Thu, 1 Dec 2011 06:05:49 +0000 (-0800)
Subject: Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
X-Git-Tag: v2.0.0~6^2~415^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1cba98aab5ee2d0576bbbbb92ba3488516290eb;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	bootstrap.css
---

b1cba98aab5ee2d0576bbbbb92ba3488516290eb
diff --cc bootstrap.css
index 462c254a8a,2bef99e1a3..afd87d1372
--- a/bootstrap.css
+++ b/bootstrap.css
@@@ -6,7 -6,7 +6,7 @@@
   * http://www.apache.org/licenses/LICENSE-2.0
   *
   * Designed and built with all the love in the world @twitter by @mdo and @fat.
-  * Date: Mon Nov 28 11:50:42 PST 2011
 - * Date: Wed Nov 30 00:54:47 PST 2011
++ * Date: Wed Nov 30 22:05:44 PST 2011
   */
  html, body {
    margin: 0;