From: Jacob Thornton <jacobthornton@gmail.com>
Date: Thu, 30 Jun 2011 17:44:04 +0000 (-0700)
Subject: Merge branch 'master' of http://git.local.twitter.com/bootstrap
X-Git-Tag: v1.0.0~28^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9282876b443daed99cbfac10ff6adace8b916f6b;p=thirdparty%2Fbootstrap.git

Merge branch 'master' of http://git.local.twitter.com/bootstrap

Conflicts:
	lib/bootstrap.less
---

9282876b443daed99cbfac10ff6adace8b916f6b
diff --cc lib/bootstrap.less
index 4c69ef86de,a2b0914250..834d950803
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@@ -1,15 -1,14 +1,14 @@@
-  /*!
-   * Bootstrap v0.0.1
-   *
-   * Copyright 2011 Twitter, Inc
-   * Licensed under the Apache License v2.0
-   * http://www.apache.org/licenses/LICENSE-2.0
-   *
-   * Made with love by two broheims, @mdo and @fat
-   * Date: {{ date }}
-   */
- 
 -/*
++/*!
+  * Bootstrap v1.0.0
+  *
+  * Copyright 2011 Twitter, Inc
+  * Licensed under the Apache License v2.0
+  * http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Designed and built with all the love in the world @twitter by @mdo and @fat.
++ * Date: {{ date }}
+  */
  
 -
  // CSS Reset
  @import "reset.less";